[LNT] r308865 - builtintest: Use dummy report instead of submitting to dummy instance

[Matthias Braun via llvm-commits]

Author: matze
Date: Sun Jul 23 23:46:43 2017
New Revision: 308865

URL: http://llvm.org/viewvc/llvm-project?rev=308865&view=rev
Log:
builtintest: Use dummy report instead of submitting to dummy instance

Submitting to the dummy instance isn't really necessary and fails when
using a non-default schema like 'nts'. (This only affects users that do
not --submit but --output results of lnt runtest)

Modified:
    lnt/trunk/lnt/tests/builtintest.py
    lnt/trunk/lnt/util/ImportData.py
    lnt/trunk/tests/runtest/test_suite.py

Modified: lnt/trunk/lnt/tests/builtintest.py
URL: http://llvm.org/viewvc/llvm-project/lnt/trunk/lnt/tests/builtintest.py?rev=308865&r1=308864&r2=308865&view=diff
==============================================================================
--- lnt/trunk/lnt/tests/builtintest.py (original)
+++ lnt/trunk/lnt/tests/builtintest.py Sun Jul 23 23:46:43 2017
@@ -79,18 +79,7 @@ class BuiltinTest(object):
                                                   commit,
                                                   config.verbose)
         else:
-            # Simulate a submission to retrieve the results report.
-
-            # Construct a temporary database and import the result.
-            self.log("submitting result to dummy instance")
-
-            db = lnt.server.db.v4db.V4DB("sqlite:///:memory:",
-                                         server_config.Config.dummy_instance())
-            server_report = ImportData.import_and_report(
-                None, None, db, report_path, 'json', ts_name, commit)
-            server_report['result_url'] = None
-
-        assert server_report is not None, "Results were not submitted."
+            server_report = lnt.util.ImportData.no_submit()
 
         ImportData.print_report_result(server_report, sys.stdout, sys.stderr,
                                        config.verbose)

Modified: lnt/trunk/lnt/util/ImportData.py
URL: http://llvm.org/viewvc/llvm-project/lnt/trunk/lnt/util/ImportData.py?rev=308865&r1=308864&r2=308865&view=diff
==============================================================================
--- lnt/trunk/lnt/util/ImportData.py (original)
+++ lnt/trunk/lnt/util/ImportData.py Sun Jul 23 23:46:43 2017
@@ -184,7 +184,8 @@ def print_report_result(result, out, err
     """
 
     # Print the generic import information.
-    print >>out, "Importing %r" % os.path.basename(result['import_file'])
+    if 'import_file' in result:
+        print >>out, "Importing %r" % os.path.basename(result['import_file'])
     if result['success']:
         print >>out, "Import succeeded."
         print >>out

Modified: lnt/trunk/tests/runtest/test_suite.py
URL: http://llvm.org/viewvc/llvm-project/lnt/trunk/tests/runtest/test_suite.py?rev=308865&r1=308864&r2=308865&view=diff
==============================================================================
--- lnt/trunk/tests/runtest/test_suite.py (original)
+++ lnt/trunk/tests/runtest/test_suite.py Sun Jul 23 23:46:43 2017
@@ -11,28 +11,23 @@
 # RUN:     --use-cmake %S/Inputs/test-suite-cmake/fake-cmake \
 # RUN:     --use-make %S/Inputs/test-suite-cmake/fake-make \
 # RUN:     --use-lit %S/Inputs/test-suite-cmake/fake-lit \
-# RUN:     > %t.log 2> %t.err
-# RUN: FileCheck  --check-prefix CHECK-STDOUT < %t.log %s
+# RUN:     --output %t.report \
+# RUN:     > %t.out 2> %t.err
+# RUN: lnt checkformat %t.report > %t.checkformat
 # RUN: FileCheck  --check-prefix CHECK-BASIC < %t.err %s
 # RUN: FileCheck  --check-prefix CHECK-REPORT < %t.SANDBOX/build/report.json %s
 # RUN: FileCheck  --check-prefix CHECK-XML < %t.SANDBOX/build/test-results.xunit.xml %s
 # RUN: FileCheck  --check-prefix CHECK-CSV < %t.SANDBOX/build/test-results.csv %s
+# RUN: FileCheck  --check-prefix CHECK-CHECKFORMAT < %t.checkformat %s
 
 # CHECK-REPORT: "run_order": "154331"
 # CHECK-REPORT: "Name": "nts.{{[^.]+}}.compile"
 # CHECK-REPORT: "Name": "nts.{{[^.]+}}.compile.status"
 #
-# CHECK-STDOUT: Import succeeded.
-# CHECK-STDOUT: Added Machines: 1
-# CHECK-STDOUT: Added Runs    : 1
-# CHECK-STDOUT: Added Tests   : 1
-#
 # CHECK-BASIC: Inferred C++ compiler under test
 # CHECK-BASIC: Configuring
 # CHECK-BASIC: Building
 # CHECK-BASIC: Testing
-# CHECK-BASIC: submitting result to dummy instance
-# CHECK-BASIC: Successfully created db_None/v4/nts/1
 
 # CHECK-XML: <?xml version="1.0" encoding="UTF-8"?>
 # CHECK-XML: <testsuite name="foo"
@@ -48,6 +43,11 @@
 # CHECK-CSV: Program;CC;CC_Time;CC_Hash;Exec;Exec_Time;Score
 # CHECK-CSV-NEXT: foo//foo;pass;1.3;xyz;pass;1.4;1.5
 
+# CHECK-CHECKFORMAT: Import succeeded.
+# CHECK-CHECKFORMAT: Added Machines: 1
+# CHECK-CHECKFORMAT: Added Runs    : 1
+# CHECK-CHECKFORMAT: Added Tests   : 1
+
 # Use the same sandbox again with --no-configure
 # RUN: lnt runtest test-suite \
 # RUN:     --sandbox %t.SANDBOX \