[LNT] r238300 - Enable adding test-specific records to test database.

[Kristof Beyls]

Author: kbeyls
Date: Wed May 27 02:39:57 2015
New Revision: 238300

URL: http://llvm.org/viewvc/llvm-project?rev=238300&view=rev
Log:
Enable adding test-specific records to test database.

This is commit completes the enabling of easy creation of per-test data in the
test database.


Added:
    lnt/trunk/tests/server/ui/Inputs/
    lnt/trunk/tests/server/ui/Inputs/V4Pages_extra_records.sql
Modified:
    lnt/trunk/tests/SharedInputs/SmallInstance/data/lnt_db_create.sql
    lnt/trunk/tests/SharedInputs/create_temp_instance.py
    lnt/trunk/tests/server/ui/V4Pages.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=238300&r1=238299&r2=238300&view=diff
==============================================================================
--- lnt/trunk/tests/SharedInputs/SmallInstance/data/lnt_db_create.sql (original)
+++ lnt/trunk/tests/SharedInputs/SmallInstance/data/lnt_db_create.sql Wed May 27 02:39:57 2015
@@ -118,7 +118,6 @@ CREATE TABLE "NT_Test" (
 	PRIMARY KEY ("ID")
 );
 INSERT INTO "NT_Test" VALUES(1,'SingleSource/UnitTests/2006-12-01-float_varg');
-INSERT INTO "NT_Test" VALUES(87,'SingleSource/UnitTests/ObjC/block-byref-aggr');
 CREATE TABLE "NT_Run" (
 	"ID" INTEGER NOT NULL, 
 	"MachineID" INTEGER, 
@@ -167,7 +166,6 @@ CREATE TABLE "compile_Test" (
 );
 INSERT INTO "compile_Test" VALUES(1,'compile/OmniGroupFrameworks/NSBezierPath-OAExtensions.m/assembly/(-O0 -g)');
 INSERT INTO "compile_Test" VALUES(2,'compile/JavaScriptCore/Interpreter.cpp/init/(-O0 -g)');
-INSERT INTO "compile_Test" VALUES(38,'compile/403.gcc/combine.c/init/(-O0)');
 CREATE TABLE "compile_Order" (
 	"ID" INTEGER NOT NULL, 
 	"NextOrder" INTEGER, 

Modified: lnt/trunk/tests/SharedInputs/create_temp_instance.py
URL: http://llvm.org/viewvc/llvm-project/lnt/trunk/tests/SharedInputs/create_temp_instance.py?rev=238300&r1=238299&r2=238300&view=diff
==============================================================================
--- lnt/trunk/tests/SharedInputs/create_temp_instance.py (original)
+++ lnt/trunk/tests/SharedInputs/create_temp_instance.py Wed May 27 02:39:57 2015
@@ -1,12 +1,25 @@
 import sys, shutil, os.path, os, subprocess
 
-_, template_sourcedir, dest_dir = sys.argv
+usage = "%s template_source_dir dest_dir [extra.sql]"
+
+if len(sys.argv) not in (3,4):
+    print usage
+    sys.exit(-1)
+if len(sys.argv) == 3:
+    _, template_source_dir, dest_dir = sys.argv
+    extra_sql = None
+else:
+    _, template_source_dir, dest_dir, extra_sql = sys.argv
 os.mkdir(os.path.join(dest_dir))
-shutil.copy(os.path.join(template_sourcedir, "lnt.cfg"), dest_dir)
-shutil.copy(os.path.join(template_sourcedir, "lnt.wsgi"), dest_dir)
+shutil.copy(os.path.join(template_source_dir, "lnt.cfg"), dest_dir)
+shutil.copy(os.path.join(template_source_dir, "lnt.wsgi"), dest_dir)
 os.mkdir(os.path.join(dest_dir, "data"))
 # create sqlite database from sql script
-cmd = "sqlite3 -batch %s/lnt.db < %s/lnt_db_create.sql" % \
-      (os.path.join(dest_dir,"data"),
-       os.path.join(template_sourcedir,"data"))
+lnt_db = "%s/lnt.db" % os.path.join(dest_dir, "data")
+cmd = "sqlite3 -batch %s < %s/lnt_db_create.sql" % \
+      (lnt_db,
+       os.path.join(template_source_dir,"data"))
 subprocess.check_call(cmd, shell="True")
+if extra_sql:
+    cmd = "sqlite3 -batch %s < %s" % (lnt_db, extra_sql)
+    subprocess.check_call(cmd, shell="True")

Added: lnt/trunk/tests/server/ui/Inputs/V4Pages_extra_records.sql
URL: http://llvm.org/viewvc/llvm-project/lnt/trunk/tests/server/ui/Inputs/V4Pages_extra_records.sql?rev=238300&view=auto
==============================================================================
--- lnt/trunk/tests/server/ui/Inputs/V4Pages_extra_records.sql (added)
+++ lnt/trunk/tests/server/ui/Inputs/V4Pages_extra_records.sql Wed May 27 02:39:57 2015
@@ -0,0 +1,4 @@
+BEGIN TRANSACTION;
+INSERT INTO "NT_Test" VALUES(87,'SingleSource/UnitTests/ObjC/block-byref-aggr');
+INSERT INTO "compile_Test" VALUES(38,'compile/403.gcc/combine.c/init/(-O0)');
+COMMIT;

Modified: lnt/trunk/tests/server/ui/V4Pages.py
URL: http://llvm.org/viewvc/llvm-project/lnt/trunk/tests/server/ui/V4Pages.py?rev=238300&r1=238299&r2=238300&view=diff
==============================================================================
--- lnt/trunk/tests/server/ui/V4Pages.py (original)
+++ lnt/trunk/tests/server/ui/V4Pages.py Wed May 27 02:39:57 2015
@@ -4,7 +4,7 @@
 # create temporary instance
 # Cleanup temporary directory in case one remained from a previous run - also see PR9904.
 # RUN: rm -rf %t.instance
-# RUN: python %{shared_inputs}/create_temp_instance.py %{shared_inputs}/SmallInstance %t.instance
+# RUN: python %{shared_inputs}/create_temp_instance.py %{shared_inputs}/SmallInstance %t.instance %S/Inputs/V4Pages_extra_records.sql
 #
 # RUN: python %s %t.instance