From: Thierry Parmentelat Date: Mon, 27 Jan 2014 08:50:00 +0000 (+0100) Subject: cleanup X-Git-Tag: tests-5.3-2~27 X-Git-Url: http://git.onelab.eu/?p=tests.git;a=commitdiff_plain;h=de7d5e8f60adaa9fc3d16efa80eee4968546c839 cleanup --- diff --git a/system/TestMain.py b/system/TestMain.py index cf8f670..ff6098f 100755 --- a/system/TestMain.py +++ b/system/TestMain.py @@ -527,7 +527,6 @@ steps refer to a method in TestPlc or to a step_* module def main(self): try: success=self.run() - print 'run has returned %s'%success if success == 'SUCCESS': return 0 elif success == 'IGNORED': return 2 else: return 1 @@ -540,5 +539,4 @@ steps refer to a method in TestPlc or to a step_* module if __name__ == "__main__": exit_code = TestMain().main() - print 'run_log is exiting',exit_code sys.exit(exit_code) diff --git a/system/run_log b/system/run_log index e170463..08833aa 100755 --- a/system/run_log +++ b/system/run_log @@ -14,7 +14,9 @@ rm -f logs/$runlast; (cd logs; ln -s $runfile $runlast) rm -f logs/$tracelast; (cd logs; ln -s $tracefile $tracelast) python -u TestMain.py -t logs/$tracefile "$@" &> logs/$runfile ; retcod=$? cat logs/$runfile -[ "$retcod" == 0 ] && touch logs/success +case "$retcod" in + 0) touch logs/success ;; + 2) touch logs/warning ;; +esac -echo "run_log is exiting" $retcod exit $retcod