[LNT] r309166 - Change testdata, so the problem fixed in r309149 gets catched
Matthias Braun via llvm-commits
llvm-commits at lists.llvm.org
Wed Jul 26 13:07:05 PDT 2017
Author: matze
Date: Wed Jul 26 13:07:04 2017
New Revision: 309166
URL: http://llvm.org/viewvc/llvm-project?rev=309166&view=rev
Log:
Change testdata, so the problem fixed in r309149 gets catched
Modified:
lnt/trunk/tests/SharedInputs/SmallInstance/data/lnt_db_create.sql
lnt/trunk/tests/server/ui/test_api.py
Modified: lnt/trunk/tests/SharedInputs/SmallInstance/data/lnt_db_create.sql
URL: http://llvm.org/viewvc/llvm-project/lnt/trunk/tests/SharedInputs/SmallInstance/data/lnt_db_create.sql?rev=309166&r1=309165&r2=309166&view=diff
==============================================================================
--- lnt/trunk/tests/SharedInputs/SmallInstance/data/lnt_db_create.sql (original)
+++ lnt/trunk/tests/SharedInputs/SmallInstance/data/lnt_db_create.sql Wed Jul 26 13:07:04 2017
@@ -179,13 +179,13 @@ INSERT INTO "NT_Run" ("MachineID", "Orde
"EndTime", "SimpleRunID", "Parameters")
VALUES(1,1,
'server/db/Inputs/lnt_v0.4.0_filled_instance/lnt_tmp/default/2012-04/data-2012-04-11_16-47-40bEjSGd.plist','2012-04-11 16:28:23.000000','2012-04-11 16:28:58.000000',
- NULL, CAST('[["ARCH", "x86_64"], ["CC_UNDER_TEST_IS_CLANG", "1"], ["CC_UNDER_TEST_TARGET_IS_X86_64", "1"], ["DISABLE_CBE", "1"], ["DISABLE_JIT", "1"], ["ENABLE_HASHED_PROGRAM_OUTPUT", "1"], ["ENABLE_OPTIMIZED", "1"], ["LLC_OPTFLAGS", "-O3"], ["LLI_OPTFLAGS", "-O3"], ["OPTFLAGS", "-O3"], ["TARGET_CC", "None"], ["TARGET_CXX", "None"], ["TARGET_FLAGS", ""], ["TARGET_LLVMGCC", "/tmp/bin/clang"], ["TARGET_LLVMGXX", "/tmp/bin/clang++"], ["TEST", "simple"], ["USE_REFERENCE_OUTPUT", "1"], ["__report_version__", "1"], ["cc1_exec_hash", "faf962f75130a6a50b5e8f61048c27ece631d0fd"], ["cc_alt_src_branch", "trunk"], ["cc_alt_src_revision", "154329"], ["cc_as_version", "LLVM (http://llvm.org/):\n LLVM version 3.1svn\n Optimized build.\n Built Apr 9 2012 (11:55:07).\n Default target: x86_64-apple-darwin11.3.0\n Host CPU: corei7-avx"], ["cc_build", "DEV"], ["cc_exec_hash", "faf962f75130a6a50b5e8f61048c27ece631d0fd"], ["cc_ld_version", "@(#)PROGRAM:ld PROJECT:ld64-123.2.1\nLibrary search paths:\n\t/usr/lib\n\t/usr/local/lib\nFramework search paths:\n\t/Library/Frameworks/\n\t/System/Library/Frameworks/"], ["cc_name", "clang"], ["cc_src_branch", "trunk"], ["cc_src_revision", "154331"], ["cc_target", "x86_64-apple-macosx10.7.0"], ["cc_version", "clang version 3.1 (trunk 154331) (llvm/trunk 154329)\nTarget: x86_64-apple-darwin11.3.0\nThread model: posix\n \"/tmp/bin/clang\" \"-cc1\" \"-triple\" \"x86_64-apple-macosx10.7.0\" \"-E\" \"-disable-free\" \"-disable-llvm-verifier\" \"-main-file-name\" \"null\" \"-pic-level\" \"2\" \"-mdisable-fp-elim\" \"-masm-verbose\" \"-munwind-tables\" \"-target-cpu\" \"core2\" \"-v\" \"-resource-dir\" \"/tmp/bin/../lib/clang/3.1\" \"-fmodule-cache-path\" \"/var/folders/32/jb9nf1gs6hx12s0brx1xdy8w0000gn/T/clang-module-cache\" \"-fdebug-compilation-dir\" \"/tmp/SANDBOX\" \"-ferror-limit\" \"19\" \"-fmessage-length\" \"0\" \"-stack-protector\" \"1\" \"-mstackrealign\" \"-fblocks\" \"-fobjc-runtime-has-arc\" \"-fobjc-runtime-has-weak\" \"-fobjc-dispatch-method=mixed\" \"-fobjc-default-synthesize-properties\" \"-fdiagnostics-show-option\" \"-o\" \"-\" \"-x\" \"c\" \"/dev/null\""], ["cc_version_number", "3.1"], ["inferred_run_order", "154331"], ["sw_vers", "ProductName:\tMac OS X\nProductVersion:\t10.7.3\nBuildVersion:\t11D50b"], ["test_suite_revision", "154271"]]' AS BLOB)
+ NULL, CAST('[["ARCH", "x86_64"], ["CC_UNDER_TEST_IS_CLANG", "1"], ["CC_UNDER_TEST_TARGET_IS_X86_64", "1"], ["DISABLE_CBE", "1"], ["DISABLE_JIT", "1"], ["ENABLE_HASHED_PROGRAM_OUTPUT", "1"], ["ENABLE_OPTIMIZED", "1"], ["LLC_OPTFLAGS", "-O3"], ["LLI_OPTFLAGS", "-O3"], ["OPTFLAGS", "-O3"], ["TARGET_CC", "None"], ["TARGET_CXX", "None"], ["TARGET_FLAGS", ""], ["TARGET_LLVMGCC", "/tmp/bin/clang"], ["TARGET_LLVMGXX", "/tmp/bin/clang++"], ["TEST", "simple"], ["USE_REFERENCE_OUTPUT", "1"], ["__report_version__", "1"], ["cc1_exec_hash", "faf962f75130a6a50b5e8f61048c27ece631d0fd"], ["cc_alt_src_branch", "trunk"], ["cc_alt_src_revision", "154329"], ["cc_as_version", "LLVM (http://llvm.org/):\n LLVM version 3.1svn\n Optimized build.\n Built Apr 9 2012 (11:55:07).\n Default target: x86_64-apple-darwin11.3.0\n Host CPU: corei7-avx"], ["cc_build", "DEV"], ["cc_exec_hash", "faf962f75130a6a50b5e8f61048c27ece631d0fd"], ["cc_ld_version", "@(#)PROGRAM:ld PROJECT:ld64-123.2.1\nLibrary search paths:\n\t/usr/lib\n\t/usr/local/lib\nFramework search paths:\n\t/Library/Frameworks/\n\t/System/Library/Frameworks/"], ["cc_name", "clang"], ["cc_src_branch", "trunk"], ["cc_src_revision", "154331"], ["cc_target", "x86_64-apple-macosx10.7.0"], ["cc_version", "clang version 3.1 (trunk 154331) (llvm/trunk 154329)\nTarget: x86_64-apple-darwin11.3.0\nThread model: posix\n \"/tmp/bin/clang\" \"-cc1\" \"-triple\" \"x86_64-apple-macosx10.7.0\" \"-E\" \"-disable-free\" \"-disable-llvm-verifier\" \"-main-file-name\" \"null\" \"-pic-level\" \"2\" \"-mdisable-fp-elim\" \"-masm-verbose\" \"-munwind-tables\" \"-target-cpu\" \"core2\" \"-v\" \"-resource-dir\" \"/tmp/bin/../lib/clang/3.1\" \"-fmodule-cache-path\" \"/var/folders/32/jb9nf1gs6hx12s0brx1xdy8w0000gn/T/clang-module-cache\" \"-fdebug-compilation-dir\" \"/tmp/SANDBOX\" \"-ferror-limit\" \"19\" \"-fmessage-length\" \"0\" \"-stack-protector\" \"1\" \"-mstackrealign\" \"-fblocks\" \"-fobjc-runtime-has-arc\" \"-fobjc-runtime-has-weak\" \"-fobjc-dispatch-method=mixed\" \"-fobjc-default-synthesize-properties\" \"-fdiagnostics-show-option\" \"-o\" \"-\" \"-x\" \"c\" \"/dev/null\""], ["cc_version_number", "3.1"], ["inferred_run_order", "154331"], ["sw_vers", "ProductName:\tMac OS X\nProductVersion:\t10.7.3\nBuildVersion:\t11D50b"], ["test_suite_revision", "154271"], ["no_errors", true]]' AS BLOB)
); -- ID 1
INSERT INTO "NT_Run" ("MachineID", "OrderID", "ImportedFrom", "StartTime",
"EndTime", "SimpleRunID", "Parameters")
VALUES(1,2,
'report.json','2012-04-11 21:13:53.000000','2012-04-11 21:14:49.000000',
- NULL, CAST('[["ARCH", "x86_64"], ["CC_UNDER_TEST_IS_CLANG", "1"], ["CC_UNDER_TEST_TARGET_IS_X86_64", "1"], ["DISABLE_CBE", "1"], ["DISABLE_JIT", "1"], ["ENABLE_HASHED_PROGRAM_OUTPUT", "1"], ["ENABLE_OPTIMIZED", "1"], ["LLC_OPTFLAGS", "-O3"], ["LLI_OPTFLAGS", "-O3"], ["OPTFLAGS", "-O3"], ["TARGET_CC", "None"], ["TARGET_CXX", "None"], ["TARGET_FLAGS", ""], ["TARGET_LLVMGCC", "/tmp/bin/clang"], ["TARGET_LLVMGXX", "/tmp/bin/clang++"], ["TEST", "simple"], ["USE_REFERENCE_OUTPUT", "1"], ["__report_version__", "1"], ["cc1_exec_hash", "984ed8386e2acc8aef74ac3e59ef5e18b7406257"], ["cc_alt_src_branch", "trunk"], ["cc_alt_src_revision", "152288"], ["cc_as_version", "LLVM (http://llvm.org/):\n LLVM version 3.1svn\n Optimized build.\n Built Mar 7 2012 (15:19:54).\n Default target: x86_64-apple-darwin11.3.0\n Host CPU: corei7-avx"], ["cc_build", "DEV"], ["cc_exec_hash", "984ed8386e2acc8aef74ac3e59ef5e18b7406257"], ["cc_ld_version", "@(#)PROGRAM:ld PROJECT:ld64-123.2.1\nLibrary search paths:\n\t/usr/lib\n\t/usr/local/lib\nFramework search paths:\n\t/Library/Frameworks/\n\t/System/Library/Frameworks/"], ["cc_name", "clang"], ["cc_src_branch", "trunk"], ["cc_src_revision", "152289"], ["cc_target", "x86_64-apple-macosx10.7.0"], ["cc_version", "clang version 3.1 (trunk 152289) (llvm/trunk 152288)\nTarget: x86_64-apple-darwin11.3.0\nThread model: posix\n \"/tmp/bin/clang\" \"-cc1\" \"-triple\" \"x86_64-apple-macosx10.7.0\" \"-E\" \"-disable-free\" \"-disable-llvm-verifier\" \"-main-file-name\" \"null\" \"-pic-level\" \"1\" \"-mdisable-fp-elim\" \"-masm-verbose\" \"-munwind-tables\" \"-target-cpu\" \"core2\" \"-v\" \"-resource-dir\" \"/tmp/bin/../lib/clang/3.1\" \"-fmodule-cache-path\" \"/var/folders/32/jb9nf1gs6hx12s0brx1xdy8w0000gn/T/clang-module-cache\" \"-fdebug-compilation-dir\" \"/tmp/SANDBOX\" \"-ferror-limit\" \"19\" \"-fmessage-length\" \"0\" \"-stack-protector\" \"1\" \"-mstackrealign\" \"-fblocks\" \"-fobjc-runtime-has-arc\" \"-fobjc-runtime-has-weak\" \"-fobjc-dispatch-method=mixed\" \"-fobjc-default-synthesize-properties\" \"-fdiagnostics-show-option\" \"-o\" \"-\" \"-x\" \"c\" \"/dev/null\""], ["cc_version_number", "3.1"], ["inferred_run_order", "152289"], ["sw_vers", "ProductName:\tMac OS X\nProductVersion:\t10.7.3\nBuildVersion:\t11D50b"], ["test_suite_revision", "154271"]]' AS BLOB)
+ NULL, CAST('[["ARCH", "x86_64"], ["CC_UNDER_TEST_IS_CLANG", "1"], ["CC_UNDER_TEST_TARGET_IS_X86_64", "1"], ["DISABLE_CBE", "1"], ["DISABLE_JIT", "1"], ["ENABLE_HASHED_PROGRAM_OUTPUT", "1"], ["ENABLE_OPTIMIZED", "1"], ["LLC_OPTFLAGS", "-O3"], ["LLI_OPTFLAGS", "-O3"], ["OPTFLAGS", "-O3"], ["TARGET_CC", "None"], ["TARGET_CXX", "None"], ["TARGET_FLAGS", ""], ["TARGET_LLVMGCC", "/tmp/bin/clang"], ["TARGET_LLVMGXX", "/tmp/bin/clang++"], ["TEST", "simple"], ["USE_REFERENCE_OUTPUT", "1"], ["__report_version__", "1"], ["cc1_exec_hash", "984ed8386e2acc8aef74ac3e59ef5e18b7406257"], ["cc_alt_src_branch", "trunk"], ["cc_alt_src_revision", "152288"], ["cc_as_version", "LLVM (http://llvm.org/):\n LLVM version 3.1svn\n Optimized build.\n Built Mar 7 2012 (15:19:54).\n Default target: x86_64-apple-darwin11.3.0\n Host CPU: corei7-avx"], ["cc_build", "DEV"], ["cc_exec_hash", "984ed8386e2acc8aef74ac3e59ef5e18b7406257"], ["cc_ld_version", "@(#)PROGRAM:ld PROJECT:ld64-123.2.1\nLibrary search paths:\n\t/usr/lib\n\t/usr/local/lib\nFramework search paths:\n\t/Library/Frameworks/\n\t/System/Library/Frameworks/"], ["cc_name", "clang"], ["cc_src_branch", "trunk"], ["cc_src_revision", "152289"], ["cc_target", "x86_64-apple-macosx10.7.0"], ["cc_version", "clang version 3.1 (trunk 152289) (llvm/trunk 152288)\nTarget: x86_64-apple-darwin11.3.0\nThread model: posix\n \"/tmp/bin/clang\" \"-cc1\" \"-triple\" \"x86_64-apple-macosx10.7.0\" \"-E\" \"-disable-free\" \"-disable-llvm-verifier\" \"-main-file-name\" \"null\" \"-pic-level\" \"1\" \"-mdisable-fp-elim\" \"-masm-verbose\" \"-munwind-tables\" \"-target-cpu\" \"core2\" \"-v\" \"-resource-dir\" \"/tmp/bin/../lib/clang/3.1\" \"-fmodule-cache-path\" \"/var/folders/32/jb9nf1gs6hx12s0brx1xdy8w0000gn/T/clang-module-cache\" \"-fdebug-compilation-dir\" \"/tmp/SANDBOX\" \"-ferror-limit\" \"19\" \"-fmessage-length\" \"0\" \"-stack-protector\" \"1\" \"-mstackrealign\" \"-fblocks\" \"-fobjc-runtime-has-arc\" \"-fobjc-runtime-has-weak\" \"-fobjc-dispatch-method=mixed\" \"-fobjc-default-synthesize-properties\" \"-fdiagnostics-show-option\" \"-o\" \"-\" \"-x\" \"c\" \"/dev/null\""], ["cc_version_number", "3.1"], ["inferred_run_order", "152289"], ["sw_vers", "ProductName:\tMac OS X\nProductVersion:\t10.7.3\nBuildVersion:\t11D50b"], ["test_suite_revision", "154271"], ["no_errors", false]]' AS BLOB)
); -- ID 2
CREATE TABLE "NT_Sample" (
"ID" INTEGER PRIMARY KEY NOT NULL,
Modified: lnt/trunk/tests/server/ui/test_api.py
URL: http://llvm.org/viewvc/llvm-project/lnt/trunk/tests/server/ui/test_api.py?rev=309166&r1=309165&r2=309166&view=diff
==============================================================================
--- lnt/trunk/tests/server/ui/test_api.py (original)
+++ lnt/trunk/tests/server/ui/test_api.py Wed Jul 26 13:07:04 2017
@@ -55,47 +55,49 @@ graph_data2 = [[[152293], 10.0,
u'label': u'152293',
u'runID': u'6'}]]
-possible_run_keys = {u'__report_version__',
- u'inferred_run_order',
- u'test_suite_revision',
- u'cc_alt_src_revision',
- u'USE_REFERENCE_OUTPUT',
- u'cc_as_version',
- u'DISABLE_CBE',
- u'ENABLE_OPTIMIZED',
- u'ARCH',
- u'id',
- u'DISABLE_JIT',
- u'TARGET_CXX',
- u'TARGET_CC',
- u'TARGET_LLVMGXX',
- u'cc_build',
- u'sw_vers',
- u'cc_src_branch',
- u'cc1_exec_hash',
- u'TARGET_FLAGS',
- u'CC_UNDER_TEST_TARGET_IS_X86_64',
- u'ENABLE_HASHED_PROGRAM_OUTPUT',
- u'cc_name',
- u'order_id',
- u'order_by',
- u'start_time',
- u'cc_version_number',
- u'cc_alt_src_branch',
- u'cc_version',
- u'OPTFLAGS',
- u'cc_ld_version',
- u'TARGET_LLVMGCC',
- u'LLI_OPTFLAGS',
- u'cc_target',
- u'CC_UNDER_TEST_IS_CLANG',
- u'cc_src_revision',
- u'end_time',
- u'TEST',
- u'LLC_OPTFLAGS',
- u'cc_exec_hash',
- u'llvm_project_revision'
- }
+possible_run_keys = {
+ u'ARCH',
+ u'CC_UNDER_TEST_IS_CLANG',
+ u'CC_UNDER_TEST_TARGET_IS_X86_64',
+ u'DISABLE_CBE',
+ u'DISABLE_JIT',
+ u'ENABLE_HASHED_PROGRAM_OUTPUT',
+ u'ENABLE_OPTIMIZED',
+ u'LLC_OPTFLAGS',
+ u'LLI_OPTFLAGS',
+ u'OPTFLAGS',
+ u'TARGET_CC',
+ u'TARGET_CXX',
+ u'TARGET_FLAGS',
+ u'TARGET_LLVMGCC',
+ u'TARGET_LLVMGXX',
+ u'TEST',
+ u'USE_REFERENCE_OUTPUT',
+ u'__report_version__',
+ u'cc1_exec_hash',
+ u'cc_alt_src_branch',
+ u'cc_alt_src_revision',
+ u'cc_as_version',
+ u'cc_build',
+ u'cc_exec_hash',
+ u'cc_ld_version',
+ u'cc_name',
+ u'cc_src_branch',
+ u'cc_src_revision',
+ u'cc_target',
+ u'cc_version',
+ u'cc_version_number',
+ u'end_time',
+ u'id',
+ u'inferred_run_order',
+ u'llvm_project_revision',
+ u'no_errors',
+ u'order_by',
+ u'order_id',
+ u'start_time',
+ u'sw_vers',
+ u'test_suite_revision',
+}
possible_machine_keys = {u'name',
u'hostname',
@@ -151,7 +153,7 @@ class JSONAPITester(unittest.TestCase):
self.assertEqual(len(j['runs']), 2)
for run in j['runs']:
- self.assertSetEqual(set(run.keys()), possible_run_keys)
+ self.assertSetEqual(set(run.keys()), possible_run_keys)
# Invalid machine ids are 404.
check_json(client, 'api/db_default/v4/nts/machines/99', expected_code=404)
More information about the llvm-commits
mailing list