diff --git a/tests/hwsim/run-all.sh b/tests/hwsim/run-all.sh index 9a33c3252..bd894a1e8 100755 --- a/tests/hwsim/run-all.sh +++ b/tests/hwsim/run-all.sh @@ -63,7 +63,7 @@ if ! ./start.sh $CONCURRENT $VALGRIND $TRACE; then exit 1 fi -./run-tests.py -D --logdir "$LOGDIR" $TRACE_ARGS -l $DB -e failed -r results.txt $CONCURRENT_TESTS $@ || errors=1 +./run-tests.py -D --logdir "$LOGDIR" $TRACE_ARGS -l $DB -e failed $CONCURRENT_TESTS $@ || errors=1 ./stop-wifi.sh diff --git a/tests/hwsim/run-tests.py b/tests/hwsim/run-tests.py index fd58cda23..240b19082 100755 --- a/tests/hwsim/run-tests.py +++ b/tests/hwsim/run-tests.py @@ -107,10 +107,6 @@ def main(): parser.add_argument('-e', metavar="", dest='errorfile', nargs='?', const="failed", help='error filename (in log directory)') - parser.add_argument('-r', metavar="", dest='resultsfile', - nargs='?', const="results.txt", - help='results filename (in log directory)') - parser.add_argument('-S', metavar='', dest='database', help='database to write results to') parser.add_argument('--commit', metavar='', @@ -158,7 +154,6 @@ def main(): print_res = True error_file = args.errorfile and os.path.join(args.logdir, args.errorfile) - results_file = args.resultsfile and os.path.join(args.logdir, args.resultsfile) if args.database: import sqlite3 @@ -270,10 +265,6 @@ def main(): if log_to_file or print_res: print result sys.stdout.flush() - if results_file: - f = open(results_file, 'a') - f.write(result + "\n") - f.close() except Exception, e: end = datetime.now() diff = end - start @@ -285,10 +276,6 @@ def main(): if log_to_file: print result sys.stdout.flush() - if results_file: - f = open(results_file, 'a') - f.write(result + "\n") - f.close() for d in dev: try: d.request("NOTE TEST-STOP " + name)