[llvm-commits] [LNT] r154402 - in /lnt/trunk/tests: SharedInputs/ SharedInputs/sample-a-small.plist SharedInputs/sample-b-small.plist lit.cfg server/db/ImportV4TestSuiteInstance.py server/db/Inputs/sample-a-small.plist server/db/Inputs/sample-b-small.plist
Daniel Dunbar
daniel at zuster.org
Tue Apr 10 09:39:17 PDT 2012
Author: ddunbar
Date: Tue Apr 10 11:39:16 2012
New Revision: 154402
URL: http://llvm.org/viewvc/llvm-project?rev=154402&view=rev
Log:
[tests] Create a SharedInputs dir (and substitution).
Added:
lnt/trunk/tests/SharedInputs/
lnt/trunk/tests/SharedInputs/sample-a-small.plist
- copied, changed from r154401, lnt/trunk/tests/server/db/Inputs/sample-a-small.plist
lnt/trunk/tests/SharedInputs/sample-b-small.plist
- copied, changed from r154401, lnt/trunk/tests/server/db/Inputs/sample-b-small.plist
Removed:
lnt/trunk/tests/server/db/Inputs/sample-a-small.plist
lnt/trunk/tests/server/db/Inputs/sample-b-small.plist
Modified:
lnt/trunk/tests/lit.cfg
lnt/trunk/tests/server/db/ImportV4TestSuiteInstance.py
Copied: lnt/trunk/tests/SharedInputs/sample-a-small.plist (from r154401, lnt/trunk/tests/server/db/Inputs/sample-a-small.plist)
URL: http://llvm.org/viewvc/llvm-project/lnt/trunk/tests/SharedInputs/sample-a-small.plist?p2=lnt/trunk/tests/SharedInputs/sample-a-small.plist&p1=lnt/trunk/tests/server/db/Inputs/sample-a-small.plist&r1=154401&r2=154402&rev=154402&view=diff
==============================================================================
(empty)
Copied: lnt/trunk/tests/SharedInputs/sample-b-small.plist (from r154401, lnt/trunk/tests/server/db/Inputs/sample-b-small.plist)
URL: http://llvm.org/viewvc/llvm-project/lnt/trunk/tests/SharedInputs/sample-b-small.plist?p2=lnt/trunk/tests/SharedInputs/sample-b-small.plist&p1=lnt/trunk/tests/server/db/Inputs/sample-b-small.plist&r1=154401&r2=154402&rev=154402&view=diff
==============================================================================
(empty)
Modified: lnt/trunk/tests/lit.cfg
URL: http://llvm.org/viewvc/llvm-project/lnt/trunk/tests/lit.cfg?rev=154402&r1=154401&r2=154402&view=diff
==============================================================================
--- lnt/trunk/tests/lit.cfg (original)
+++ lnt/trunk/tests/lit.cfg Tue Apr 10 11:39:16 2012
@@ -28,6 +28,8 @@
config.environment['PYTHONPATH'] = src_root
config.substitutions.append(('%src_root', src_root))
+config.substitutions.append(('%{shared_inputs}', os.path.join(
+ src_root, 'tests', 'SharedInputs')))
# Enable coverage.py reporting, assuming sitecustomize.py in the virtualenv has
# been modified appropriately.
Modified: lnt/trunk/tests/server/db/ImportV4TestSuiteInstance.py
URL: http://llvm.org/viewvc/llvm-project/lnt/trunk/tests/server/db/ImportV4TestSuiteInstance.py?rev=154402&r1=154401&r2=154402&view=diff
==============================================================================
--- lnt/trunk/tests/server/db/ImportV4TestSuiteInstance.py (original)
+++ lnt/trunk/tests/server/db/ImportV4TestSuiteInstance.py Tue Apr 10 11:39:16 2012
@@ -5,7 +5,7 @@
# RUN: lnt create %t.install
# Import the first test set.
-# RUN: lnt import %t.install %S/Inputs/sample-a-small.plist \
+# RUN: lnt import %t.install %{shared_inputs}/sample-a-small.plist \
# RUN: --commit=1 --show-sample-count > %t1.log
# RUN: FileCheck -check-prefix=IMPORT-A-1 %s < %t1.log
#
@@ -15,7 +15,7 @@
# IMPORT-A-1: Added Samples : 2
# Import the second test set.
-# RUN: lnt import %t.install %S/Inputs/sample-b-small.plist \
+# RUN: lnt import %t.install %{shared_inputs}/sample-b-small.plist \
# RUN: --commit=1 --show-sample-count --show-sql > %t2.log
# RUN: FileCheck -check-prefix=IMPORT-B %s < %t2.log
#
@@ -23,7 +23,7 @@
# IMPORT-B: Added Samples : 1
# Check that reimporting the first test set properly reports as a duplicate.
-# RUN: lnt import %t.install %S/Inputs/sample-a-small.plist \
+# RUN: lnt import %t.install %{shared_inputs}/sample-a-small.plist \
# RUN: --commit=1 --show-sample-count > %t3.log
# RUN: FileCheck -check-prefix=IMPORT-A-2 %s < %t3.log
#
Removed: lnt/trunk/tests/server/db/Inputs/sample-a-small.plist
URL: http://llvm.org/viewvc/llvm-project/lnt/trunk/tests/server/db/Inputs/sample-a-small.plist?rev=154401&view=auto
==============================================================================
--- lnt/trunk/tests/server/db/Inputs/sample-a-small.plist (original)
+++ lnt/trunk/tests/server/db/Inputs/sample-a-small.plist (removed)
@@ -1,104 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
- <key>Machine</key>
- <dict>
- <key>Info</key>
- <dict>
- <key>extrakey</key>
- <string>extravalue</string>
- <key>os</key>
- <string>SAMPLE OS</string>
- <key>hardware</key>
- <string>x86_64</string>
- </dict>
- <key>Name</key>
- <string>LNT SAMPLE MACHINE</string>
- </dict>
- <key>Run</key>
- <dict>
- <key>End Time</key>
- <string>2009-11-17 03:44:48</string>
- <key>Info</key>
- <dict>
- <key>tag</key>
- <string>nts</string>
- <key>run_order</key>
- <string> 1</string>
- </dict>
- <key>Start Time</key>
- <string>2009-11-17 02:12:25</string>
- </dict>
- <key>Tests</key>
- <array>
- <dict>
- <key>Data</key>
- <array>
- <integer>0</integer>
- </array>
- <key>Info</key>
- <dict>
- </dict>
- <key>Name</key>
- <string>nts.sampletest.compile.status</string>
- </dict>
- <dict>
- <key>Data</key>
- <array>
- <real>0.019</real>
- </array>
- <key>Info</key>
- <dict>
- </dict>
- <key>Name</key>
- <string>nts.sampletest.compile</string>
- </dict>
- <dict>
- <key>Data</key>
- <array>
- <integer>0</integer>
- </array>
- <key>Info</key>
- <dict>
- </dict>
- <key>Name</key>
- <string>nts.sampletest.exec.status</string>
- </dict>
- <dict>
- <key>Data</key>
- <array>
- <real>0.3</real>
- </array>
- <key>Info</key>
- <dict>
- </dict>
- <key>Name</key>
- <string>nts.sampletest.exec</string>
- </dict>
-
- <dict>
- <key>Data</key>
- <array>
- <real>0.0189</real>
- </array>
- <key>Info</key>
- <dict>
- </dict>
- <key>Name</key>
- <string>nts.sampletest.compile</string>
- </dict>
- <dict>
- <key>Data</key>
- <array>
- <real>0.29</real>
- </array>
- <key>Info</key>
- <dict>
- </dict>
- <key>Name</key>
- <string>nts.sampletest.exec</string>
- </dict>
- </array>
-</dict>
-</plist>
Removed: lnt/trunk/tests/server/db/Inputs/sample-b-small.plist
URL: http://llvm.org/viewvc/llvm-project/lnt/trunk/tests/server/db/Inputs/sample-b-small.plist?rev=154401&view=auto
==============================================================================
--- lnt/trunk/tests/server/db/Inputs/sample-b-small.plist (original)
+++ lnt/trunk/tests/server/db/Inputs/sample-b-small.plist (removed)
@@ -1,81 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
- <key>Machine</key>
- <dict>
- <key>Info</key>
- <dict>
- <key>extrakey</key>
- <string>extravalue</string>
- <key>os</key>
- <string>SAMPLE OS</string>
- <key>hardware</key>
- <string>x86_64</string>
- </dict>
- <key>Name</key>
- <string>LNT SAMPLE MACHINE</string>
- </dict>
- <key>Run</key>
- <dict>
- <key>End Time</key>
- <string>2009-11-19 03:00:12</string>
- <key>Info</key>
- <dict>
- <key>tag</key>
- <string>nts</string>
- <key>run_order</key>
- <string> 2</string>
- </dict>
- <key>Start Time</key>
- <string>2009-11-19 01:27:49</string>
- </dict>
- <key>Tests</key>
- <array>
- <dict>
- <key>Data</key>
- <array>
- <integer>0</integer>
- </array>
- <key>Info</key>
- <dict>
- </dict>
- <key>Name</key>
- <string>nts.sampletest.compile.status</string>
- </dict>
- <dict>
- <key>Data</key>
- <array>
- <real>0.022</real>
- </array>
- <key>Info</key>
- <dict>
- </dict>
- <key>Name</key>
- <string>nts.sampletest.compile</string>
- </dict>
- <dict>
- <key>Data</key>
- <array>
- <integer>0</integer>
- </array>
- <key>Info</key>
- <dict>
- </dict>
- <key>Name</key>
- <string>nts.sampletest.exec.status</string>
- </dict>
- <dict>
- <key>Data</key>
- <array>
- <real>0.32</real>
- </array>
- <key>Info</key>
- <dict>
- </dict>
- <key>Name</key>
- <string>nts.sampletest.exec</string>
- </dict>
- </array>
-</dict>
-</plist>
More information about the llvm-commits
mailing list