[llvm-commits] [zorg] r147991 - in /zorg/trunk/lnt: lnt/lnttool/create.py lnt/server/db/v4db.py lnt/server/reporting/runs.py tests/server/db/ImportV4TestSuiteInstance.py tests/server/db/Inputs/sample-a-small.plist tests/server/db/Inputs/sample-b-small.plist
Daniel Dunbar
daniel at zuster.org
Wed Jan 11 17:27:17 PST 2012
Author: ddunbar
Date: Wed Jan 11 19:27:17 2012
New Revision: 147991
URL: http://llvm.org/viewvc/llvm-project?rev=147991&view=rev
Log:
[lnt/v0.4] lnt.server.db: Change import to use "tag" field directly to determine database name.
- For historical reasons, switch the default --use-v4 database to be called "its".
Modified:
zorg/trunk/lnt/lnt/lnttool/create.py
zorg/trunk/lnt/lnt/server/db/v4db.py
zorg/trunk/lnt/lnt/server/reporting/runs.py
zorg/trunk/lnt/tests/server/db/ImportV4TestSuiteInstance.py
zorg/trunk/lnt/tests/server/db/Inputs/sample-a-small.plist
zorg/trunk/lnt/tests/server/db/Inputs/sample-b-small.plist
Modified: zorg/trunk/lnt/lnt/lnttool/create.py
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/lnt/lnt/lnttool/create.py?rev=147991&r1=147990&r2=147991&view=diff
==============================================================================
--- zorg/trunk/lnt/lnt/lnttool/create.py (original)
+++ zorg/trunk/lnt/lnt/lnttool/create.py Wed Jan 11 19:27:17 2012
@@ -88,7 +88,7 @@
db.commit()
# Create an NT compatible test suite, automatically.
- ts = testsuite.TestSuite("nt", "NT")
+ ts = testsuite.TestSuite("nts", "NT")
# Define the default status kinds.
#
@@ -134,7 +134,7 @@
# Finally, ensure the tables for the test suite we just defined are
# constructed.
- ts_db = db.testsuite['nt']
+ ts_db = db.testsuite['nts']
def action_create(name, args):
"""create an LLVM nightly test installation"""
Modified: zorg/trunk/lnt/lnt/server/db/v4db.py
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/lnt/lnt/server/db/v4db.py?rev=147991&r1=147990&r2=147991&view=diff
==============================================================================
--- zorg/trunk/lnt/lnt/server/db/v4db.py (original)
+++ zorg/trunk/lnt/lnt/server/db/v4db.py Wed Jan 11 19:27:17 2012
@@ -112,11 +112,9 @@
# Select the database to import into.
#
# FIXME: Promote this to a top-level field in the data.
- tag = data['Run']['Info'].get('tag')
- db_name = { 'nts' : 'nt' }.get(tag)
+ db_name = data['Run']['Info'].get('tag')
if db_name is None:
- raise ValueError,"unknown database target from tag %r" % (
- tag,)
+ raise ValueError,"unknown database target (no tag field)"
db = self.testsuite.get(db_name)
if db is None:
Modified: zorg/trunk/lnt/lnt/server/reporting/runs.py
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/lnt/lnt/server/reporting/runs.py?rev=147991&r1=147990&r2=147991&view=diff
==============================================================================
--- zorg/trunk/lnt/lnt/server/reporting/runs.py (original)
+++ zorg/trunk/lnt/lnt/server/reporting/runs.py Wed Jan 11 19:27:17 2012
@@ -114,7 +114,7 @@
if baseurl[-1] == '/':
baseurl = baseurl[:-1]
- report_url = """%s/v4/nt/%d""" % (baseurl, run.id)
+ report_url = """%s/v4/nts/%d""" % (baseurl, run.id)
print >>report, report_url
print >>report, """Nickname: %s:%d""" % (machine.name, machine.id)
if 'name' in machine_parameters:
Modified: zorg/trunk/lnt/tests/server/db/ImportV4TestSuiteInstance.py
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/lnt/tests/server/db/ImportV4TestSuiteInstance.py?rev=147991&r1=147990&r2=147991&view=diff
==============================================================================
--- zorg/trunk/lnt/tests/server/db/ImportV4TestSuiteInstance.py (original)
+++ zorg/trunk/lnt/tests/server/db/ImportV4TestSuiteInstance.py Wed Jan 11 19:27:17 2012
@@ -70,7 +70,7 @@
tests = list(ts.query(ts.Test))
assert len(tests) == 1
test = tests[0]
-assert tests[0].name == 'sampletest'
+assert tests[0].name == 'nts.sampletest'
# Validate the orders.
orders = list(ts.query(ts.Order).order_by(ts.Order.ordinal))
Modified: zorg/trunk/lnt/tests/server/db/Inputs/sample-a-small.plist
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/lnt/tests/server/db/Inputs/sample-a-small.plist?rev=147991&r1=147990&r2=147991&view=diff
==============================================================================
--- zorg/trunk/lnt/tests/server/db/Inputs/sample-a-small.plist (original)
+++ zorg/trunk/lnt/tests/server/db/Inputs/sample-a-small.plist Wed Jan 11 19:27:17 2012
@@ -41,7 +41,7 @@
<dict>
</dict>
<key>Name</key>
- <string>sampletest.compile.status</string>
+ <string>nts.sampletest.compile.status</string>
</dict>
<dict>
<key>Data</key>
@@ -52,7 +52,7 @@
<dict>
</dict>
<key>Name</key>
- <string>sampletest.compile</string>
+ <string>nts.sampletest.compile</string>
</dict>
<dict>
<key>Data</key>
@@ -63,7 +63,7 @@
<dict>
</dict>
<key>Name</key>
- <string>sampletest.exec.status</string>
+ <string>nts.sampletest.exec.status</string>
</dict>
<dict>
<key>Data</key>
@@ -74,7 +74,7 @@
<dict>
</dict>
<key>Name</key>
- <string>sampletest.exec</string>
+ <string>nts.sampletest.exec</string>
</dict>
</array>
</dict>
Modified: zorg/trunk/lnt/tests/server/db/Inputs/sample-b-small.plist
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/lnt/tests/server/db/Inputs/sample-b-small.plist?rev=147991&r1=147990&r2=147991&view=diff
==============================================================================
--- zorg/trunk/lnt/tests/server/db/Inputs/sample-b-small.plist (original)
+++ zorg/trunk/lnt/tests/server/db/Inputs/sample-b-small.plist Wed Jan 11 19:27:17 2012
@@ -41,7 +41,7 @@
<dict>
</dict>
<key>Name</key>
- <string>sampletest.compile.status</string>
+ <string>nts.sampletest.compile.status</string>
</dict>
<dict>
<key>Data</key>
@@ -52,7 +52,7 @@
<dict>
</dict>
<key>Name</key>
- <string>sampletest.compile</string>
+ <string>nts.sampletest.compile</string>
</dict>
<dict>
<key>Data</key>
@@ -63,7 +63,7 @@
<dict>
</dict>
<key>Name</key>
- <string>sampletest.exec.status</string>
+ <string>nts.sampletest.exec.status</string>
</dict>
<dict>
<key>Data</key>
@@ -74,7 +74,7 @@
<dict>
</dict>
<key>Name</key>
- <string>sampletest.exec</string>
+ <string>nts.sampletest.exec</string>
</dict>
</array>
</dict>
More information about the llvm-commits
mailing list