From: Nick Mathewson <nickm@torproject.org>
Date: Sat, 8 May 2010 23:56:25 +0000 (-0400)
Subject: Fix test.sh on freebsd
X-Git-Tag: release-2.0.5-beta~4
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3d9e05b17498c8b982a8d34031341fbe9b6dbb0e;p=libevent

Fix test.sh on freebsd

It turns out that in all conformant shells, "unset FOO" removes FOO
both from the shell's variables and from the exported environment.
(I've tested this on msys, opensolaris, linux, osx, and freebsd.)

And in nearly every shell I can find, "unset FOO; export FOO" does
the same as unset FOO... except in my FreeBSD VM, where the "export
FOO" sets the exported value of FOO equal to "".  This broke test.sh
for us.

The fix is simple: remove the needless exports!
---

diff --git a/test/test.sh b/test/test.sh
index 0bcc2272..e132fc38 100755
--- a/test/test.sh
+++ b/test/test.sh
@@ -91,42 +91,35 @@ announce "Running tests:"
 # Need to do this by hand?
 setup
 unset EVENT_NOKQUEUE
-export EVENT_NOKQUEUE
 announce "KQUEUE"
 run_tests
 
 setup
 unset EVENT_NODEVPOLL
-export EVENT_NODEVPOLL
 announce "DEVPOLL"
 run_tests
 
 setup
 unset EVENT_NOPOLL
-export EVENT_NOPOLL
 announce "POLL"
 run_tests
 
 setup
 unset EVENT_NOSELECT
-export EVENT_NOSELECT
 announce "SELECT"
 run_tests
 
 setup
 unset EVENT_NOEPOLL
-export EVENT_NOEPOLL
 announce "EPOLL"
 run_tests
 
 setup
 unset EVENT_NOEVPORT
-export EVENT_NOEVPORT
 announce "EVPORT"
 run_tests
 
 setup
 unset EVENT_NOWIN32
-export EVENT_NOWIN32
 announce "WIN32"
 run_tests