From 75ef81d55cc597d5010b42f3a19ea461ce43c9c6 Mon Sep 17 00:00:00 2001
From: Danny Auble <da@schedmd.com>
Date: Wed, 28 Aug 2013 10:51:16 -0700
Subject: [PATCH] Make code slightly cleaner
---
testsuite/expect/test31.1 | 22 +++++++++-------------
1 file changed, 9 insertions(+), 13 deletions(-)
diff --git a/testsuite/expect/test31.1 b/testsuite/expect/test31.1
index a49c10ed70a..3026dc63641 100755
--- a/testsuite/expect/test31.1
+++ b/testsuite/expect/test31.1
@@ -78,20 +78,16 @@ proc change_pro_epi { arg program_name conf_change task_pro } {
set exit_code 1
}
- if {$sys_check == 1 && $task_pro == 1} {
- exec $bin_echo "#!/bin/bash
-touch /tmp/$arg.$test_id.txt
-exit 0" > $config_dir/$pro_epi_prog
- } elseif {$sys_check == 1} {
- exec $bin_echo "#!/bin/bash
-/tmp/$program_name 1000&
-touch /tmp/$arg.$test_id.txt
-exit 0" > $config_dir/$pro_epi_prog
- } else {
- exec $bin_echo "#!/bin/bash
-/tmp/$program_name 1000&
-exit 0" > $config_dir/$pro_epi_prog
+ exec $bin_echo "#!/bin/bash\n" > $config_dir/$pro_epi_prog
+ if {$sys_check == 1} {
+ exec $bin_echo "touch /tmp/$arg.$test_id.txt" >> $config_dir/$pro_epi_prog
+ }
+
+ # task prologs are ran with fork_wait so don't do the sleep
+ if {!$task_pro} {
+ exec $bin_echo "/tmp/$program_name 1000&" >> $config_dir/$pro_epi_prog
}
+ exec $bin_echo "exit 0" >> $config_dir/$pro_epi_prog
exec $bin_chmod 700 $config_dir/$pro_epi_prog
}
--
GitLab