Merge pull request #6507 from garlick/path_true_false

testsuite: don't assume /bin/true and /bin/false

src/broker/test/runat.c

@@ -78,8 +78,8 @@ void basic (flux_t *h)
         "runat_is_defined name=test1 returns false");
     ok (runat_is_completed (r, "test1") == false,
         "runat_is_completed name=test1 returns false");
-    ok (runat_push_shell_command (r, "test1", "/bin/true", 0) == 0
-        && runat_push_shell_command (r, "test1", "/bin/true", 0) == 0,
+    ok (runat_push_shell_command (r, "test1", "true", 0) == 0
+        && runat_push_shell_command (r, "test1", "true", 0) == 0,
         "pushed true;true");
     ok (runat_is_defined (r, "test1") == true,
         "runat_is_defined name=test1 returns true after creation");
@@ -101,8 +101,8 @@ void basic (flux_t *h)
 
     /* run false;true */
     clear_list (logs);
-    ok (runat_push_shell_command (r, "test2", "/bin/true", 0) == 0
-        && runat_push_shell_command (r, "test2", "/bin/false", 0) == 0,
+    ok (runat_push_shell_command (r, "test2", "true", 0) == 0
+        && runat_push_shell_command (r, "test2", "false", 0) == 0,
         "pushed true;true");
     ok (runat_start (r, "test2", test_completion, &ctx) == 0,
         "runat_start works");
@@ -119,8 +119,8 @@ void basic (flux_t *h)
 
     /* run true;false */
     clear_list (logs);
-    ok (runat_push_command (r, "test3", "/bin/false", 11, 0) == 0
-        && runat_push_command (r, "test3", "/bin/true", 10, 0) == 0,
+    ok (runat_push_command (r, "test3", "false", 6, 0) == 0
+        && runat_push_command (r, "test3", "true", 5, 0) == 0,
         "pushed true;true");
     ok (runat_start (r, "test3", test_completion, &ctx) == 0,
         "runat_start works");
@@ -221,9 +221,9 @@ void basic (flux_t *h)
 #if __GLIBC__ < 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ < 24)
     flags |= RUNAT_FLAG_FORK_EXEC;
 #endif
-    ok (runat_push_shell_command (r, "test7", "/bin/true", flags) == 0
+    ok (runat_push_shell_command (r, "test7", "true", flags) == 0
             && runat_push_shell_command (r, "test7", "sleep 3600", flags) == 0,
-        "pushed /bin/true;sleep 3600");
+        "pushed true;sleep 3600");
     ok (runat_start (r, "test7", test_completion, &ctx) == 0,
         "runat_start works");
     ok (runat_abort (r, "test7") == 0,

src/common/libsubprocess/test/channel.c

@@ -384,7 +384,7 @@ void channel_nul_terminate_cb (flux_subprocess_t *p, const char *stream)
 
 void test_bufsize (flux_reactor_t *r)
 {
-    char *av[] = { "/bin/true", NULL };
+    char *av[] = { "true", NULL };
     flux_cmd_t *cmd;
     flux_subprocess_t *p = NULL;
 
@@ -427,7 +427,7 @@ void test_bufsize (flux_reactor_t *r)
 
 void test_bufsize_error (flux_reactor_t *r)
 {
-    char *av[] = { "/bin/true", NULL };
+    char *av[] = { "true", NULL };
     flux_cmd_t *cmd;
     flux_subprocess_t *p = NULL;
     flux_subprocess_ops_t ops = {

src/common/libsubprocess/test/remote.c

@@ -58,7 +58,7 @@ extern char **environ;
 
 void corner_case_test (flux_t *h)
 {
-    char *true_av[] = { "/bin/true", NULL };
+    char *true_av[] = { "true", NULL };
     flux_subprocess_t *p;
     flux_cmd_t *cmd;
 
@@ -243,20 +243,20 @@ void simple_test (flux_t *h)
 {
     struct simple_scorecard exp;
 
-    char *true_av[] = { "/bin/true", NULL };
+    char *true_av[] = { "true", NULL };
     memset (&exp, 0, sizeof (exp));
     exp.running = 1;
     exp.exited = 1;
     exp.completion = 1;
     exp.stdout_eof = 1;
     exp.stderr_eof = 1;
     simple_run_check (h,
-                      "/bin/true",
+                      "true",
                       ARRAY_SIZE (true_av) - 1,
                       true_av,
                       &exp);
 
-    char *false_av[] = { "/bin/false", NULL };
+    char *false_av[] = { "false", NULL };
     memset (&exp, 0, sizeof (exp));
     exp.running = 1;
     exp.exited = 1;
@@ -265,7 +265,7 @@ void simple_test (flux_t *h)
     exp.stdout_eof = 1;
     exp.stderr_eof = 1;
     simple_run_check (h,
-                      "/bin/false",
+                      "false",
                       ARRAY_SIZE (false_av) - 1,
                       false_av,
                       &exp);

src/common/libsubprocess/test/stdio.c

@@ -1085,7 +1085,7 @@ void test_line_buffer_disable (flux_reactor_t *r)
 
 void test_line_buffer_error (flux_reactor_t *r)
 {
-    char *av[] = { "/bin/true", NULL };
+    char *av[] = { "true", NULL };
     flux_cmd_t *cmd;
     flux_subprocess_t *p = NULL;
 

src/common/libsubprocess/test/subprocess.c

@@ -68,7 +68,7 @@ void completion_cb (flux_subprocess_t *p)
 void test_corner_cases (flux_reactor_t *r)
 {
     flux_t *h = NULL;
-    char *avgood[] = { "/bin/true", NULL };
+    char *avgood[] = { "true", NULL };
     char *avbad[] = { NULL };
     flux_cmd_t *cmd;
 
@@ -106,7 +106,7 @@ void test_corner_cases (flux_reactor_t *r)
     flux_cmd_destroy (cmd);
 
     ok ((cmd = flux_cmd_create (1, avgood, NULL)) != NULL,
-        "flux_cmd_create with /bin/true works");
+        "flux_cmd_create with true works");
     ok (flux_rexec (h, -10, 0, cmd, NULL) == NULL
         && errno == EINVAL,
         "flux_rexec fails with cmd with invalid rank");
@@ -174,7 +174,7 @@ void test_corner_cases (flux_reactor_t *r)
         "flux_subprocess_aux_get fails with NULL pointer input");
 
     ok ((cmd = flux_cmd_create (1, avgood, NULL)) != NULL,
-        "flux_cmd_create with /bin/true works");
+        "flux_cmd_create with true works");
     ok (flux_local_exec (r,
                          FLUX_SUBPROCESS_FLAGS_LOCAL_UNBUF,
                          cmd,
@@ -188,7 +188,7 @@ void test_corner_cases (flux_reactor_t *r)
 
 void test_post_exec_errors (flux_reactor_t *r)
 {
-    char *av[] = { "/bin/true", NULL };
+    char *av[] = { "true", NULL };
     flux_cmd_t *cmd;
     flux_subprocess_t *p = NULL;
 
@@ -256,7 +256,7 @@ void test_post_exec_errors (flux_reactor_t *r)
 
 void test_basic (flux_reactor_t *r)
 {
-    char *av[] = { "/bin/true", NULL };
+    char *av[] = { "true", NULL };
     flux_cmd_t *cmd, *cmd2;
     flux_reactor_t *r2;
     flux_subprocess_t *p = NULL;
@@ -301,7 +301,7 @@ void completion_fail_cb (flux_subprocess_t *p)
 
 void test_basic_fail (flux_reactor_t *r)
 {
-    char *av[] = { "/bin/false", NULL };
+    char *av[] = { "false", NULL };
     flux_cmd_t *cmd;
     flux_subprocess_t *p = NULL;
 
@@ -326,7 +326,7 @@ void test_basic_fail (flux_reactor_t *r)
 
 void test_flag_no_setpgrp (flux_reactor_t *r)
 {
-    char *av[] = { "/bin/true", NULL };
+    char *av[] = { "true", NULL };
     flux_cmd_t *cmd;
     flux_subprocess_t *p = NULL;
 
@@ -351,7 +351,7 @@ void test_flag_no_setpgrp (flux_reactor_t *r)
 
 void test_flag_fork_exec (flux_reactor_t *r)
 {
-    char *av[] = { "/bin/true", NULL };
+    char *av[] = { "true", NULL };
     flux_cmd_t *cmd;
     flux_subprocess_t *p = NULL;
 
@@ -651,7 +651,7 @@ void state_change_cb (flux_subprocess_t *p, flux_subprocess_state_t state)
 
 void test_state_change (flux_reactor_t *r)
 {
-    char *av[] = { "/bin/true", NULL };
+    char *av[] = { "true", NULL };
     flux_cmd_t *cmd;
     flux_subprocess_t *p = NULL;
 
@@ -771,7 +771,7 @@ void test_exec_fail (flux_reactor_t *r)
 
 void test_context (flux_reactor_t *r)
 {
-    char *av[] = { "/bin/true", NULL };
+    char *av[] = { "true", NULL };
     flux_cmd_t *cmd;
     flux_subprocess_t *p = NULL;
     char *extra = "mydata";
@@ -804,7 +804,7 @@ void test_context (flux_reactor_t *r)
 
 void test_refcount (flux_reactor_t *r)
 {
-    char *av[] = { "/bin/true", NULL };
+    char *av[] = { "true", NULL };
     flux_cmd_t *cmd;
     flux_subprocess_t *p = NULL;
     char *extra = "mydata";
@@ -849,7 +849,7 @@ void shmem_hook_cb (flux_subprocess_t *p, void *arg)
 
 void test_pre_exec_hook (flux_reactor_t *r)
 {
-    char *av[] = { "/bin/true", NULL };
+    char *av[] = { "true", NULL };
     flux_cmd_t *cmd;
     flux_subprocess_t *p = NULL;
     int *shmem_count;
@@ -900,7 +900,7 @@ void count_hook_cb (flux_subprocess_t *p, void *arg)
 
 void test_post_fork_hook (flux_reactor_t *r)
 {
-    char *av[] = { "/bin/true", NULL };
+    char *av[] = { "true", NULL };
     flux_cmd_t *cmd;
     flux_subprocess_t *p = NULL;
     int hook_count = 0;
@@ -940,7 +940,7 @@ void destroy_in_completion_cb (flux_subprocess_t *p)
 
 void test_destroy_in_completion (flux_reactor_t *r)
 {
-    char *av[] = { "/bin/true", NULL };
+    char *av[] = { "true", NULL };
     flux_cmd_t *cmd, *cmd2;
     flux_reactor_t *r2;
     flux_subprocess_t *p = NULL;

src/common/libutil/test/popen2.c

@@ -97,8 +97,8 @@ int main(int argc, char** argv)
         "popen2 /noexist failed with ENOENT");
 
     /* open/close (child exit error) */
-    ok ((p = popen2 ("/bin/false", (char*[]){ "/bin/false", NULL }, 0)) != NULL,
-        "popen2 /bin/false OK");
+    ok ((p = popen2 ("false", (char*[]){ "false", NULL }, 0)) != NULL,
+        "popen2 false OK");
     ok (pclose2 (p) == 0x100,
         "pclose2 returns child exit code 1");
 

t/issues/t4465-job-list-use-after-free.sh

@@ -23,7 +23,7 @@ mkdir ${STATEDIR}
 # number of broker ranks.
 #
 flux start --test-size=8 -Sstatedir=${STATEDIR} \
-    bash -c "flux submit --cc 1-8 --quiet /bin/true && flux queue drain"
+    bash -c "flux submit --cc 1-8 --quiet true && flux queue drain"
 
 flux start --test-size=1 -Sstatedir=${STATEDIR} \
     --wrap=libtool,e,${VALGRIND} \

t/issues/t4852-t_submit-legacy.sh

@@ -7,7 +7,7 @@
 cat <<-EOF >t4852setup.sh
 #!/bin/sh -e
 
-jobid=\$(flux submit --wait /bin/true)
+jobid=\$(flux submit --wait true)
 
 kvspath=\$(flux job id --to=kvs \$jobid)
 

t/issues/t5308-kvsdir-initial-path.py

@@ -9,7 +9,7 @@
 from flux.job import JobspecV1
 
 handle = flux.Flux()
-jobspec = JobspecV1.from_command(command=["/bin/true"], num_tasks=1, num_nodes=1)
+jobspec = JobspecV1.from_command(command=["true"], num_tasks=1, num_nodes=1)
 jobid = flux.job.submit(handle, jobspec, waitable=True)
 flux.job.wait(handle, jobid=jobid)
 jobdir = flux.job.job_kvs(handle, jobid)

t/job-manager/submit-sliding-window.py

@@ -29,7 +29,7 @@
 # Open connection to broker
 h = flux.Flux()
 
-jobspec = JobspecV1.from_command(["/bin/true"])
+jobspec = JobspecV1.from_command(["true"])
 done = 0
 running = 0
 

t/job-manager/submit-wait.py

@@ -27,16 +27,16 @@
 h = flux.Flux()
 
 # Submit njobs test jobs (half will fail)
-jobspec = JobspecV1.from_command(["/bin/true"])
-jobspec_fail = JobspecV1.from_command(["/bin/false"])
+jobspec = JobspecV1.from_command(["true"])
+jobspec_fail = JobspecV1.from_command(["false"])
 jobs = []
 for i in range(njobs):
     if i < njobs / 2:
         jobid = job.submit(h, jobspec, waitable=True)
-        print("submit: {} /bin/true".format(jobid))
+        print("submit: {} true".format(jobid))
     else:
         jobid = job.submit(h, jobspec_fail, waitable=True)
-        print("submit: {} /bin/false".format(jobid))
+        print("submit: {} false".format(jobid))
     jobs.append(jobid)
 
 # Wait for each job in turn

t/job-manager/submit-waitany.py

@@ -27,15 +27,15 @@
 h = flux.Flux()
 
 # Submit njobs test jobs (half will fail)
-jobspec = JobspecV1.from_command(["/bin/true"])
-jobspec_fail = JobspecV1.from_command(["/bin/false"])
+jobspec = JobspecV1.from_command(["true"])
+jobspec_fail = JobspecV1.from_command(["false"])
 for i in range(njobs):
     if i < njobs / 2:
         jobid = job.submit(h, jobspec, waitable=True)
-        print("submit: {} /bin/true".format(jobid))
+        print("submit: {} true".format(jobid))
     else:
         jobid = job.submit(h, jobspec_fail, waitable=True)
-        print("submit: {} /bin/false".format(jobid))
+        print("submit: {} false".format(jobid))
 
 
 # Wait for njobs jobs

t/job-manager/wait-interrupted.py

@@ -28,11 +28,11 @@
 h = flux.Flux()
 
 # Submit njobs test jobs
-jobspec = JobspecV1.from_command(["/bin/true"])
+jobspec = JobspecV1.from_command(["true"])
 jobs = []
 for i in range(njobs):
     jobid = job.submit(h, jobspec, waitable=True)
-    print("submit: {} /bin/true".format(jobid))
+    print("submit: {} true".format(jobid))
     jobs.append(jobid)
 
 # Async wait which we immediately abandon

t/system/0004-recovery.t

@@ -6,16 +6,16 @@ test_expect_success 'dump the last checkpoint' '
         sudo -u flux flux dump --checkpoint /tmp/dump.tar
 '
 test_expect_success 'flux start --recover fails when instance is running' '
-	test_must_fail sudo -u flux flux start --recover /bin/true
+	test_must_fail sudo -u flux flux start --recover true
 '
 test_expect_success 'stop the system instance' '
 	sudo flux shutdown
 '
 test_expect_success 'flux start --recover works' '
-	sudo -u flux flux start --recover /bin/true
+	sudo -u flux flux start --recover true
 '
 test_expect_success 'flux start --recover works from dump file' '
-	sudo -u flux flux start --recover=/tmp/dump.tar --sysconfig /bin/true
+	sudo -u flux flux start --recover=/tmp/dump.tar --sysconfig true
 '
 test_expect_success 'restart flux' '
         sudo systemctl start flux

t/system/0005-exec.t

@@ -7,16 +7,16 @@ test_expect_success 'start a long-running guest job' '
 	jobid=$(flux job last)
 '
 test_expect_success 'flux exec --jobid fails as guest' '
-	test_must_fail flux exec --jobid=$jobid /bin/true
+	test_must_fail flux exec --jobid=$jobid true
 '
 test_expect_success 'flux exec --jobid fails as instance owner' '
-	test_must_fail sudo -u flux flux exec --jobid=$jobid /bin/true
+	test_must_fail sudo -u flux flux exec --jobid=$jobid true
 '
 test_expect_success 'flux exec without --jobid works as instance owner' '
-	sudo -u flux flux exec -r 0 /bin/true
+	sudo -u flux flux exec -r 0 true
 '
 test_expect_success 'flux exec without --jobid fails as guest' '
-	test_must_fail flux exec -r 0 /bin/true
+	test_must_fail flux exec -r 0 true
 '
 test_expect_success 'cancel long-running job' '
 	flux cancel $jobid

t/t0000-sharness.t

@@ -461,7 +461,7 @@ test_expect_success 'empty sharness.d directory does not cause failure' '
 		test_description="sharness works"
 		. ./sharness.sh
 		test_expect_success "test success" "
-			/bin/true
+			true
 		"
 		test_done
 		EOF