[commit: testsuite] master: Rename some numeric tests: nnnn -> Tnnnn (ffeb501)

Ian Lynagh igloo at earth.li
Sat Jan 26 01:29:15 CET 2013


Repository : ssh://darcs.haskell.org//srv/darcs/testsuite

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/ffeb5011e5eabcdd50bda9163b4ca4bb47803140

>---------------------------------------------------------------

commit ffeb5011e5eabcdd50bda9163b4ca4bb47803140
Author: Ian Lynagh <ian at well-typed.com>
Date:   Fri Jan 25 16:00:09 2013 +0000

    Rename some numeric tests: nnnn -> Tnnnn

>---------------------------------------------------------------

 tests/cabal/1750.stderr  |    5 -----
 tests/cabal/1750.stdout  |    4 ----
 tests/cabal/1750A.pkg    |    4 ----
 tests/cabal/1750B.pkg    |    4 ----
 tests/cabal/Makefile     |   22 +++++++++++-----------
 tests/cabal/T1750.stderr |    5 +++++
 tests/cabal/T1750.stdout |    4 ++++
 tests/cabal/T1750A.pkg   |    4 ++++
 tests/cabal/T1750B.pkg   |    4 ++++
 tests/cabal/all.T        |   10 +++++-----
 10 files changed, 33 insertions(+), 33 deletions(-)

diff --git a/tests/cabal/1750.stderr b/tests/cabal/1750.stderr
deleted file mode 100644
index 71bed07..0000000
--- a/tests/cabal/1750.stderr
+++ /dev/null
@@ -1,5 +0,0 @@
-WARNING: there are broken packages.  Run 'ghc-pkg check' for more details.
-<command line>: cannot satisfy -package 1750A: 
-    1750A-1-XXX is unusable due to missing or recursive dependencies:
-      1750B-1-XXX
-    (use -v for more information)
diff --git a/tests/cabal/1750.stdout b/tests/cabal/1750.stdout
deleted file mode 100644
index dac998e..0000000
--- a/tests/cabal/1750.stdout
+++ /dev/null
@@ -1,4 +0,0 @@
-local1750.package.conf:
-    {1750A-1}
-    {1750B-1}
-
diff --git a/tests/cabal/1750A.pkg b/tests/cabal/1750A.pkg
deleted file mode 100644
index e32c97f..0000000
--- a/tests/cabal/1750A.pkg
+++ /dev/null
@@ -1,4 +0,0 @@
-name: 1750A
-version: 1
-id: 1750A-1-XXX
-depends: 1750B-1-XXX
diff --git a/tests/cabal/1750B.pkg b/tests/cabal/1750B.pkg
deleted file mode 100644
index 5e9ff1f..0000000
--- a/tests/cabal/1750B.pkg
+++ /dev/null
@@ -1,4 +0,0 @@
-name: 1750B
-version: 1
-id: 1750B-1-XXX
-depends: 1750A-1-XXX
diff --git a/tests/cabal/Makefile b/tests/cabal/Makefile
index 769a50d..f0091bc 100644
--- a/tests/cabal/Makefile
+++ b/tests/cabal/Makefile
@@ -110,20 +110,20 @@ ghcpkg06 :
 	if $(LOCAL_GHC_PKG06) register testdup.pkg; then false else true; fi
 	$(LOCAL_GHC_PKG06) register --force testdup.pkg
 
-PKGCONF1750=local1750.package.conf
-LOCAL_GHC_PKG1750 = '$(GHC_PKG)' --no-user-package-db -f $(PKGCONF1750)
-
-1750:
-	rm -rf $(PKGCONF1750) 1750.hs 1750.o 1750.hi 1750.out
-	$(LOCAL_GHC_PKG1750) init $(PKGCONF1750)
-	$(LOCAL_GHC_PKG1750) register --force 1750A.pkg >1750.out 2>&1
-	$(LOCAL_GHC_PKG1750) register --force 1750B.pkg >1750.out 2>&1
-	GHC_PACKAGE_PATH=$(PKGCONF1750) '$(GHC_PKG)' --no-user-package-db list
+PKGCONFT1750=localT1750.package.conf
+LOCAL_GHC_PKGT1750 = '$(GHC_PKG)' --no-user-package-db -f $(PKGCONFT1750)
+
+T1750:
+	rm -rf $(PKGCONFT1750) T1750.hs T1750.o T1750.hi T1750.out
+	$(LOCAL_GHC_PKGT1750) init $(PKGCONFT1750)
+	$(LOCAL_GHC_PKGT1750) register --force T1750A.pkg >T1750.out 2>&1
+	$(LOCAL_GHC_PKGT1750) register --force T1750B.pkg >T1750.out 2>&1
+	GHC_PACKAGE_PATH=$(PKGCONFT1750) '$(GHC_PKG)' --no-user-package-db list
 # GHC_PACKAGE_PATH trick is to make this work with 6.8.2 which doesn't have
 # the patch "Change the command-line semantics for query commands" to
 # ghc-pkg
-	echo "main = return ()" >1750.hs
-	'$(TEST_HC)' $(TEST_HC_OPTS) -package-db $(PKGCONF1750) -package 1750A 1750.hs || true
+	echo "main = return ()" >T1750.hs
+	'$(TEST_HC)' $(TEST_HC_OPTS) -package-db $(PKGCONFT1750) -package T1750A T1750.hs || true
 
 PKGCONFSHADOW1=localshadow1.package.conf
 PKGCONFSHADOW2=localshadow2.package.conf
diff --git a/tests/cabal/T1750.stderr b/tests/cabal/T1750.stderr
new file mode 100644
index 0000000..1809d5b
--- /dev/null
+++ b/tests/cabal/T1750.stderr
@@ -0,0 +1,5 @@
+WARNING: there are broken packages.  Run 'ghc-pkg check' for more details.
+<command line>: cannot satisfy -package T1750A: 
+    T1750A-1-XXX is unusable due to missing or recursive dependencies:
+      T1750B-1-XXX
+    (use -v for more information)
diff --git a/tests/cabal/T1750.stdout b/tests/cabal/T1750.stdout
new file mode 100644
index 0000000..62d0323
--- /dev/null
+++ b/tests/cabal/T1750.stdout
@@ -0,0 +1,4 @@
+localT1750.package.conf:
+    {T1750A-1}
+    {T1750B-1}
+
diff --git a/tests/cabal/T1750A.pkg b/tests/cabal/T1750A.pkg
new file mode 100644
index 0000000..9bda51e
--- /dev/null
+++ b/tests/cabal/T1750A.pkg
@@ -0,0 +1,4 @@
+name: T1750A
+version: 1
+id: T1750A-1-XXX
+depends: T1750B-1-XXX
diff --git a/tests/cabal/T1750B.pkg b/tests/cabal/T1750B.pkg
new file mode 100644
index 0000000..479ce70
--- /dev/null
+++ b/tests/cabal/T1750B.pkg
@@ -0,0 +1,4 @@
+name: T1750B
+version: 1
+id: T1750B-1-XXX
+depends: T1750A-1-XXX
diff --git a/tests/cabal/all.T b/tests/cabal/all.T
index f84688c..04e918d 100644
--- a/tests/cabal/all.T
+++ b/tests/cabal/all.T
@@ -51,11 +51,11 @@ test('ghcpkg06',
 # (this was disallowed in GHC 6.4 and earlier)
 test('pkg01', normal, compile, [''])
 
-test('1750',
-     extra_clean(['1750.hs', '1750.out',
-                  'local1750.package.conf',
-                  'local1750.package.conf.old']),
-     run_command, ['$MAKE -s --no-print-directory 1750'])
+test('T1750',
+     extra_clean(['T1750.hs', 'T1750.out',
+                  'localT1750.package.conf',
+                  'localT1750.package.conf.old']),
+     run_command, ['$MAKE -s --no-print-directory T1750'])
 
 test('shadow',
      extra_clean(['shadow.out', 'shadow.hs', 'shadow.hi',





More information about the ghc-commits mailing list