From abb265d40a425d5b64c7677db68c0596e9ec7cb6 Mon Sep 17 00:00:00 2001
From: Nicolas Joly <njoly@pasteur.fr>
Date: Wed, 2 Sep 2015 10:25:24 -0700
Subject: [PATCH] Test changes for NetBSD

Do not use full path for true utility in testsuite. Its location
differ across systems (/bin/true on Linux and /usr/bin/true on BSD).
---
 testsuite/expect/test11.8      | 4 ++--
 testsuite/expect/test6.12      | 4 ++--
 testsuite/expect/test8.21.bash | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/testsuite/expect/test11.8 b/testsuite/expect/test11.8
index 73b23f42504..147cca92e97 100755
--- a/testsuite/expect/test11.8
+++ b/testsuite/expect/test11.8
@@ -117,8 +117,8 @@ set timeout [expr $max_job_delay + 60 + 60 + 60]
 exec $bin_rm -f $file_in
 set file [open $file_in "w"]
 puts $file "# multi-program configuration file
-1,3   /bin/true
-0,2   /bin/date
+1,3   true
+0,2   date
 "
 close $file
 exec $bin_chmod 700 $file_in
diff --git a/testsuite/expect/test6.12 b/testsuite/expect/test6.12
index 261b763562f..242000107bd 100755
--- a/testsuite/expect/test6.12
+++ b/testsuite/expect/test6.12
@@ -71,9 +71,9 @@ file delete $file_out $file_err
 make_bash_script $file_in "
 $srun $bin_sleep 500 &
 
-trap /bin/true SIGINT
+trap true SIGINT
 
-while /bin/true; do
+while true; do
 	wait
 	if \[ \$? -ge 128 \]; then
 		echo \"INTerrupted wait, resuming\"
diff --git a/testsuite/expect/test8.21.bash b/testsuite/expect/test8.21.bash
index 8fb666d1908..c7a74398c0b 100755
--- a/testsuite/expect/test8.21.bash
+++ b/testsuite/expect/test8.21.bash
@@ -13,7 +13,7 @@ test_mode=$5
 delay_time=1
 while [ $delay_time -le 60 ]
 do
-	$srun -N1  --test-only --immediate /bin/true
+	$srun -N1  --test-only --immediate true
 	rc=$?
 	if [ $rc -eq 0 ]
 	then
-- 
GitLab