summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomek Mrugalski <tomasz@isc.org>2017-06-16 20:24:21 +0200
committerTomek Mrugalski <tomasz@isc.org>2017-06-16 20:24:21 +0200
commit5add6871d0461b4be20f9a3bb13628c859f42606 (patch)
tree1c221d45b732c7184abe8d002193f656a80e7e62
parent4d43d242d093d9c7d33222c5313d43f0472d61c0 (diff)
downloadisc-dhcp-5add6871d0461b4be20f9a3bb13628c859f42606.tar.gz
[rt19430] Tweaks in uid detection (works on FreeBSD now)
-rw-r--r--.gitignore2
-rw-r--r--tests/shell/dhclient_tests.sh.in4
2 files changed, 5 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore
index 268b613c..b62571b7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -35,7 +35,7 @@ server/tests/test-suite.log
tests/libt_api.a
tests/libt_api.la
tests/unittest.sh
-tests/shell/linux_script_test.sh
+tests/shell/linux_script_tests.sh
tests/shell/example_tests.sh
tests/shell/dhclient_tests.sh
tests/dhclient.log
diff --git a/tests/shell/dhclient_tests.sh.in b/tests/shell/dhclient_tests.sh.in
index 7c8c7c6b..0d049bb3 100644
--- a/tests/shell/dhclient_tests.sh.in
+++ b/tests/shell/dhclient_tests.sh.in
@@ -44,6 +44,10 @@ bin_path=/home/thomson/devel/dhcp-git/client
PROCS="dhcpd dhclient"
+# Check out effective userid. If it's non-0 (non root), then some of the tests
+# will skip.
+EUID=`id -u`
+
# Import common test library.
. /home/thomson/devel/dhcp-git/tests/shell/dhcp_test_lib.sh