# HG changeset patch
# User Rik <rik@octave.org>
# Date 1649282079 25200
# Node ID a6eabdc177bcd524c0b2ca899bcc8816c8312d11
# Parent  062e00e903a5add7e03e6717126ee8a9d586d4f2# Parent  87de38eb52d93609007a058b85835fccb0b910fc
maint: merge stable to default.

diff -r 062e00e903a5 -r a6eabdc177bc scripts/prefs/addpref.m
--- a/scripts/prefs/addpref.m	Wed Apr 06 10:35:00 2022 -0400
+++ b/scripts/prefs/addpref.m	Wed Apr 06 14:54:39 2022 -0700
@@ -82,9 +82,11 @@
 
 %!test
 %! HOME = getenv ("HOME");
+%! tmpdir = tempname ();
 %! save_default_options ("-binary", "local");
 %! unwind_protect
-%!   setenv ("HOME", P_tmpdir ());
+%!   mkdir (tmpdir);
+%!   setenv ("HOME", tmpdir);
 %!
 %!   addpref ("group1", "pref1", [1 2 3]);
 %!   assert (getpref ("group1", "pref1"), [1 2 3]);
@@ -101,7 +103,8 @@
 %!         "preference prefA already exists in GROUP group2");
 %!
 %! unwind_protect_cleanup
-%!   unlink (fullfile (P_tmpdir (), ".octave_prefs"));
+%!   unlink (fullfile (tmpdir, ".octave_prefs"));
+%!   rmdir (tmpdir);
 %!   if (isempty (HOME))
 %!     unsetenv ("HOME");
 %!   else