gen_autotest_scripts.awk: do not write output to file

Author: masamichitakagi

util/gen_autotest_scripts.awk

@@ -14,7 +14,7 @@ BEGIN {
     "dirname " ARGV[0] | getline dir;
     "cd " dir "/../.. && pwd -P" | getline autotest_home;
 
-    scriptdir = sprintf("%s/data/script", autotest_home); 
+    scriptdir = sprintf("%s/data/scripts", autotest_home);
     system("rm " scriptdir "/ltp-*");
 }
 
@@ -36,23 +36,11 @@ BEGIN {
 
     # Switch recorddir for McKernel run and Linux run
 
-    printf("if [ \"${linux_run}\" != \"yes\" ]; then\n") >> script;
-
     recorddir_base = "$WORKDIR/output";
-    printf("\trecordfile=%s/ltp-%s.output\n", recorddir_base, testcase) >> script;
-    printf("\trecorddir=%s/ltp-%s\n", recorddir_base, testcase) >> script;
-
-    printf("else\n") >> script;
-
-    recorddir_base = sprintf("%s/data/linux", autotest_home);
-    printf("\trecordfile=%s/ltp-%s.output\n", recorddir_base, testcase, testno) >> script;
-    printf("\trecorddir=%s/ltp-%s\n", recorddir_base, testcase, testno) >> script;
-    
-    printf("fi\n\n") >> script;
+    printf("recorddir=%s/ltp-%s\n", recorddir_base, testcase) >> script;
 
     printf("command_line='%s'\n\n", command_line) >> script;
     print(". ${AUTOTEST_HOME}/ltp/util/run.sh") >> script;
 
     system("chmod +x " script);
-
 }

util/run.sh

@@ -10,7 +10,7 @@ fi
 ihkosctl=$MCKINSTALL/sbin/ihkosctl
 
 # Prepare working directory
-rm -rf $recorddir && mkdir -p $recorddir && pushd $recorddir
+rm -rf $recorddir && mkdir -p $recorddir
 
 # For unexpected kmsg check
 if [ "${linux_run}" != "yes" ]; then
@@ -19,11 +19,9 @@ fi
 
 # Run LTP
 echo "$command_line" > $recorddir/command_line
-sudo bash -c "LTPMCEXEC=$mcexec MCEXEC_TIMEOUT=10800 MC_RESET_EACHTIME=0 $LTPDIR/runltp -f $recorddir/command_line > $recordfile 2>&1"
+sudo bash -c "LTPMCEXEC=$mcexec MCEXEC_TIMEOUT=10800 MC_RESET_EACHTIME=0 $LTPDIR/runltp -f $recorddir/command_line"
 exit_code=$?
 
-popd
-
 # OK/NG decision
 rc=0
 if [ "${linux_run}" != "yes" ]; then