From aee9446d0c09d511ef34e4b07b6fccc31ea04f38 Mon Sep 17 00:00:00 2001
From: Johannes Berg <johannes.berg@intel.com>
Date: Wed, 30 Oct 2013 21:01:11 +0200
Subject: [PATCH] hwsim tests: Pass commit as an argument

Rather than saving the current commit to a file, pass it
as an argument to run-tests.py.

Signed-hostap: Johannes Berg <johannes.berg@intel.com>
---
 tests/hwsim/run-all.sh   |  2 +-
 tests/hwsim/run-tests.py | 14 ++++----------
 tests/hwsim/start.sh     |  1 -
 3 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/tests/hwsim/run-all.sh b/tests/hwsim/run-all.sh
index 4822534fe..2a3e365ab 100755
--- a/tests/hwsim/run-all.sh
+++ b/tests/hwsim/run-all.sh
@@ -10,7 +10,7 @@ fi
 if [ -z "$DBFILE" ]; then
     DB=""
 else
-    DB="-S $DBFILE"
+    DB="-S $DBFILE --commit $(git rev-parse HEAD)"
     if [ -n "$BUILD" ]; then
 	DB="$DB -b $BUILD"
     fi
diff --git a/tests/hwsim/run-tests.py b/tests/hwsim/run-tests.py
index d9a135d96..568e736b4 100755
--- a/tests/hwsim/run-tests.py
+++ b/tests/hwsim/run-tests.py
@@ -63,7 +63,6 @@ def main():
     test_names = list(set([t.__name__ for t in tests]))
 
     run = None
-    commit = None
     print_res = False
 
     parser = argparse.ArgumentParser(description='hwsim test runner')
@@ -82,6 +81,8 @@ def main():
                         help='results filename')
     parser.add_argument('-S', metavar='<sqlite3 db>', dest='database',
                         help='database to write results to')
+    parser.add_argument('--commit', metavar='<commit id>',
+                        help='commit ID, only for database')
     parser.add_argument('-b', metavar='<build>', dest='build', help='build ID')
     parser.add_argument('-L', action='store_true', dest='update_tests_db',
                         help='List tests (and update descriptions in DB)')
@@ -119,13 +120,6 @@ def main():
 
     if conn:
         run = str(int(time.time()))
-        try:
-            with open("commit") as f:
-                val = f.readlines()
-                if len(val) > 0:
-                    commit = val[0].rstrip()
-        except IOError:
-            pass
 
     if args.update_tests_db:
         for t in tests:
@@ -203,7 +197,7 @@ def main():
             else:
                 passed.append(t.__name__)
                 result = "PASS"
-            report(conn, args.build, commit, run, t.__name__, result, diff)
+            report(conn, args.build, args.commit, run, t.__name__, result, diff)
             result = result + " " + t.__name__ + " "
             result = result + str(diff.total_seconds()) + " " + str(end)
             logger.info(result)
@@ -219,7 +213,7 @@ def main():
             diff = end - start
             logger.info(e)
             failed.append(t.__name__)
-            report(conn, args.build, commit, run, t.__name__, "FAIL", diff)
+            report(conn, args.build, args.commit, run, t.__name__, "FAIL", diff)
             result = "FAIL " + t.__name__ + " " + str(diff.total_seconds()) + " " + str(end)
             logger.info(result)
             if log_to_file:
diff --git a/tests/hwsim/start.sh b/tests/hwsim/start.sh
index bc96807dc..6ad9b5493 100755
--- a/tests/hwsim/start.sh
+++ b/tests/hwsim/start.sh
@@ -50,7 +50,6 @@ else
 fi
 
 $DIR/stop-wifi.sh
-git show -s --format=%H > commit
 sudo modprobe mac80211_hwsim radios=5
 if [ "$CONCURRENT" = "y" ]; then
     sudo iw wlan0 interface add sta0 type station