# HG changeset patch
# User Rik <rik@octave.org>
# Date 1411847257 25200
# Node ID 9163a6e9b09631c4eed76aef23883a45e541ec15
# Parent  6f0290863d50cccfcb5321432f4749b2256c1ddb
Use unsetenv to fix libgomp error created by nproc BIST testing.

* nproc.cc (Fnproc): Use unsetenv to delete OMP_NUM_THREADS environment
variable after testing.

* test/system.tst: Rename putenv to setenv in %!tests.

diff -r 6f0290863d50 -r 9163a6e9b096 libinterp/corefcn/nproc.cc
--- a/libinterp/corefcn/nproc.cc	Sat Sep 27 12:26:57 2014 -0700
+++ b/libinterp/corefcn/nproc.cc	Sat Sep 27 12:47:37 2014 -0700
@@ -101,7 +101,7 @@
 %!   if (! isempty (old_val))
 %!     setenv ("OMP_NUM_THREADS", old_val);
 %!   else
-%!     setenv ("OMP_NUM_THREADS", "");
+%!     unsetenv ("OMP_NUM_THREADS");
 %!   endif
 %! end_unwind_protect
 
diff -r 6f0290863d50 -r 9163a6e9b096 test/system.tst
--- a/test/system.tst	Sat Sep 27 12:26:57 2014 -0700
+++ b/test/system.tst	Sat Sep 27 12:47:37 2014 -0700
@@ -280,16 +280,16 @@
 %! warning (wns.state, "Octave:num-to-str");
 
 %!test
-%! putenv ("foobar", "baz");
+%! setenv ("foobar", "baz");
 %! assert (getenv ("foobar"), "baz");
 
-%!error <Invalid call to putenv> putenv ()
-%!error <Invalid call to putenv> putenv ("foo", "bar", 1)
+%!error <Invalid call to setenv> setenv ()
+%!error <Invalid call to setenv> setenv ("foo", "bar", 1)
 
 %!test
 %! wns = warning ("query", "Octave:num-to-str");
 %! warning ("on", "Octave:num-to-str");
-%! fail ("putenv (1, 2)","warning");
+%! fail ("setenv (1, 2)","warning");
 %! warning (wns.state, "Octave:num-to-str");
 
 %!test