[LNT] r306363 - lit: Use .shtest instead of .test.sh

[Matthias Braun via llvm-commits]

Author: matze
Date: Mon Jun 26 21:22:40 2017
New Revision: 306363

URL: http://llvm.org/viewvc/llvm-project?rev=306363&view=rev
Log:
lit: Use .shtest instead of .test.sh

lit did not correctly recognize the .test.sh suffix I introduced
earlier.

Added:
    lnt/trunk/tests/lnttool/PostgresDB.shtest
      - copied, changed from r306362, lnt/trunk/tests/lnttool/PostgresDB.test.sh
Removed:
    lnt/trunk/tests/lnttool/PostgresDB.test.sh
Modified:
    lnt/trunk/tests/lit.cfg

Modified: lnt/trunk/tests/lit.cfg
URL: http://llvm.org/viewvc/llvm-project/lnt/trunk/tests/lit.cfg?rev=306363&r1=306362&r2=306363&view=diff
==============================================================================
--- lnt/trunk/tests/lit.cfg (original)
+++ lnt/trunk/tests/lit.cfg Mon Jun 26 21:22:40 2017
@@ -17,7 +17,7 @@ execute_external = platform.system() !=
 config.test_format = lit.formats.ShTest(execute_external)
 
 # suffixes: A list of file extensions to treat as test files.
-config.suffixes = ['.py', '.test.sh']
+config.suffixes = ['.py', '.shtest']
 
 # excludes: A list of individual files to exclude.
 config.excludes = ['__init__.py', 'Inputs', 'SharedInputs']

Copied: lnt/trunk/tests/lnttool/PostgresDB.shtest (from r306362, lnt/trunk/tests/lnttool/PostgresDB.test.sh)
URL: http://llvm.org/viewvc/llvm-project/lnt/trunk/tests/lnttool/PostgresDB.shtest?p2=lnt/trunk/tests/lnttool/PostgresDB.shtest&p1=lnt/trunk/tests/lnttool/PostgresDB.test.sh&r1=306362&r2=306363&rev=306363&view=diff
==============================================================================
    (empty)

Removed: lnt/trunk/tests/lnttool/PostgresDB.test.sh
URL: http://llvm.org/viewvc/llvm-project/lnt/trunk/tests/lnttool/PostgresDB.test.sh?rev=306362&view=auto
==============================================================================
--- lnt/trunk/tests/lnttool/PostgresDB.test.sh (original)
+++ lnt/trunk/tests/lnttool/PostgresDB.test.sh (removed)
@@ -1,46 +0,0 @@
-# REQUIRES: postgres
-# RUN: rm -rf "%t.install"
-# RUN: %{shared_inputs}/postgres_wrapper.sh "%t.install" /bin/sh %s "%t.install" postgresql://pgtest@localhost:9100 "%{shared_inputs}"
-set -eux
-
-TESTDIR="$1"
-PGURL="$2"
-SHARED_INPUTS="$3"
-dropdb --if-exists --maintenance-db="${PGURL}/postgres" lnt_regr_test_PostgresDB
-createdb --maintenance-db="${PGURL}/postgres" lnt_regr_test_PostgresDB
-
-lnt create "${TESTDIR}/instance" --db-dir ${PGURL} --default-db lnt_regr_test_PostgresDB
-
-# Import a test set.
-lnt import "${TESTDIR}/instance" "${SHARED_INPUTS}/sample-a-small.plist" --commit=1 --show-sample-count
-
-# Import a test set.
-lnt import "${TESTDIR}/instance" "${SHARED_INPUTS}/sample-a-small.plist" --commit=1 --show-sample-count
-
-# Check that we remove both the sample and the run, and that we don't commit by
-# default.
-#
-lnt updatedb "${TESTDIR}/instance" --testsuite nts --delete-run 1 \
-	--show-sql > "${TESTDIR}/runrm.out"
-# RUN: FileCheck --check-prefix CHECK-RUNRM %s < "%t.install/runrm.out"
-
-# CHECK-RUNRM: DELETE FROM "NT_Sample" WHERE "NT_Sample"."RunID" IN (%(RunID_1)s)
-# CHECK-RUNRM-NEXT: {'RunID_1': 1}
-# CHECK-RUNRM: DELETE FROM "NT_Run" WHERE "NT_Run"."ID" IN (%(ID_1)s)
-# CHECK-RUNRM-NEXT: {'ID_1': 1}
-# CHECK-RUNRM: ROLLBACK
-
-# Check that we remove runs when we remove a machine.
-#
-lnt updatedb "${TESTDIR}/instance" --testsuite nts \
-	--delete-machine "LNT SAMPLE MACHINE" --commit=1 \
-	--show-sql > "${TESTDIR}/machinerm.out"
-# RUN: FileCheck --check-prefix CHECK-MACHINERM %s < "%t.install/machinerm.out"
-
-# CHECK-MACHINERM: DELETE FROM "NT_Sample" WHERE "NT_Sample"."RunID" IN (%(RunID_1)s)
-# CHECK-MACHINERM-NEXT: {'RunID_1': 1}
-# CHECK-MACHINERM: DELETE FROM "NT_Run" WHERE "NT_Run"."ID" IN (%(ID_1)s)
-# CHECK-MACHINERM-NEXT: {'ID_1': 1}
-# CHECK-MACHINERM: DELETE FROM "NT_Machine" WHERE "NT_Machine"."Name" = %(Name_1)s
-# CHECK-MACHINERM-NEXT: {'Name_1': 'LNT SAMPLE MACHINE'}
-# CHECK-MACHINERM: COMMIT