Revert "framework: Smarter re-compile. Don't run if there are compile errors"
This reverts commit af6791aacca37ac38a00282cbcade6e068a0e012
BUG=chromium-os:39367
Change-Id: I815848889162b50d6d831445e2f8ee69c7adfd3e
Reviewed-on: https://gerrit.chromium.org/gerrit/45382
Commit-Queue: Ilja H. Friedel <ihf@chromium.org>
Reviewed-by: Ilja H. Friedel <ihf@chromium.org>
Tested-by: Ilja H. Friedel <ihf@chromium.org>
diff --git a/framework/src/main.py b/framework/src/main.py
index f3d6dfb..79c8071 100644
--- a/framework/src/main.py
+++ b/framework/src/main.py
@@ -5,11 +5,12 @@
# This module is the main module for the console interface. It takes care
# of parsing the command line arguments and formating the output
from optparse import OptionParser
-from subprocess import Popen, PIPE, STDOUT
+from os import path
from tempfile import NamedTemporaryFile
import json
import math
import os
+import pprint
import sys
from mtedit.editor import LogEditor
@@ -20,7 +21,6 @@
from test_factory import TestFactory
from test_runner import ParallelTestRunner as TestRunner
-
_help_text = """\
Multitouch Regression Test Suite:
---------------------------------
@@ -75,22 +75,6 @@
$ evemu-describe /path/to/device > platform.dat
"""
-
-def Compile():
- if "SRC_DIR" not in os.environ:
- print "Requires SRC_DIR env-var. Re-run $ sudo make setup-in-place"
- sys.exit(-1)
-
- dir = os.environ["SRC_DIR"]
- print "Recompiling gestures/libevdev/replay..."
- process = Popen(["make", "in-place"], cwd=dir,
- stdout=PIPE, stderr=STDOUT)
- ret = process.wait()
- if ret != 0:
- print process.stdout.read()
- sys.exit(-1)
-
-
def Verify(device, glob):
verifier = TestVerifier(os.environ["TESTS_DIR"], device)
runner = TestRunner(os.environ["TESTS_DIR"], os.environ["XORG_CONF_DIR"])
@@ -101,9 +85,7 @@
report = verifier.Verify(case)
print report
-
def Run(glob, out_file=None, ref_file=None):
- Compile()
print "Running tests..."
runner = TestRunner(os.environ["TESTS_DIR"], os.environ["XORG_CONF_DIR"])
results = runner.RunAll(glob)
@@ -177,9 +159,7 @@
print "\x1b[91mThere are regressions present in this test run!\x1b[0m"
exit(-1)
-
def Get(test_name, what, file=None):
- Compile()
if file:
data = json.load(open(file))
results = data[test_name]
@@ -201,7 +181,6 @@
elif what == "return-activity":
return results["logs"]["activity"]
-
def Add(testname, activity_log, event_log):
"""
Adds a new test case.
@@ -212,7 +191,6 @@
if case:
print "Test \"" + case.name + "\" created"
-
def Main():
"""
Main entry point for the console interface
@@ -314,6 +292,5 @@
else:
Run(test_name, options.out, options.ref)
-
if __name__ == "__main__":
Main()