summaryrefslogtreecommitdiff
path: root/testsuite/tests/cabal
diff options
context:
space:
mode:
Diffstat (limited to 'testsuite/tests/cabal')
-rw-r--r--testsuite/tests/cabal/T12733/Makefile2
-rw-r--r--testsuite/tests/cabal/all.T5
-rw-r--r--testsuite/tests/cabal/cabal01/Makefile2
-rw-r--r--testsuite/tests/cabal/cabal01/all.T2
-rw-r--r--testsuite/tests/cabal/cabal03/Makefile2
-rw-r--r--testsuite/tests/cabal/cabal04/Makefile2
-rw-r--r--testsuite/tests/cabal/cabal05/Makefile2
-rw-r--r--testsuite/tests/cabal/cabal06/Makefile2
-rw-r--r--testsuite/tests/cabal/cabal08/Makefile2
-rw-r--r--testsuite/tests/cabal/cabal09/Makefile2
-rw-r--r--testsuite/tests/cabal/ghcpkg01.stdout33
11 files changed, 19 insertions, 37 deletions
diff --git a/testsuite/tests/cabal/T12733/Makefile b/testsuite/tests/cabal/T12733/Makefile
index 04de2ada62..03f4bfd03f 100644
--- a/testsuite/tests/cabal/T12733/Makefile
+++ b/testsuite/tests/cabal/T12733/Makefile
@@ -7,7 +7,7 @@ SETUP=../Setup -v0
T12733: clean
$(MAKE) -s --no-print-directory clean
'$(GHC_PKG)' init tmp.d
- '$(TEST_HC)' -v0 --make Setup
+ '$(TEST_HC)' $(TEST_HC_OPTS) -v0 --make Setup
cp p/P.hs.in1 p/P.hs
cd p && $(SETUP) clean
cd p && $(SETUP) configure $(CABAL_MINIMAL_BUILD) --with-ghc='$(TEST_HC)' --ghc-options='$(TEST_HC_OPTS)' --package-db=../tmp.d
diff --git a/testsuite/tests/cabal/all.T b/testsuite/tests/cabal/all.T
index 82c1b1584b..5f1b308565 100644
--- a/testsuite/tests/cabal/all.T
+++ b/testsuite/tests/cabal/all.T
@@ -1,6 +1,9 @@
def normaliseDynlibNames(str):
return re.sub('-ghc[0-9.]+\.', '-ghc<VERSION>.', str)
+def ignore_warnings(str):
+ return re.sub(r'Warning:.*\n', '', str)
+
test('ghcpkg01', [extra_files(['test.pkg', 'test2.pkg', 'test3.pkg'])], run_command, ['$MAKE -s --no-print-directory ghcpkg01'])
# Use ignore_stderr to prevent (when HADDOCK_DOCS=NO):
@@ -29,7 +32,7 @@ def normalise_haddock_junk( str ):
test('ghcpkg05',
[extra_files(['test2.pkg', 'test3.pkg']),
- normalise_errmsg_fun(normalise_haddock_junk, normaliseDynlibNames)],
+ normalise_errmsg_fun(normalise_haddock_junk, normaliseDynlibNames, ignore_warnings)],
run_command, ['$MAKE -s --no-print-directory ghcpkg05'])
test('ghcpkg06', [extra_files(['test.pkg', 'testdup.pkg'])], run_command, ['$MAKE -s --no-print-directory ghcpkg06'])
diff --git a/testsuite/tests/cabal/cabal01/Makefile b/testsuite/tests/cabal/cabal01/Makefile
index 8aff27e2df..fb73eae7fd 100644
--- a/testsuite/tests/cabal/cabal01/Makefile
+++ b/testsuite/tests/cabal/cabal01/Makefile
@@ -21,7 +21,7 @@ $(eval $(call canonicalise,PREFIX))
cabal01:
$(MAKE) -s --no-print-directory clean
- '$(TEST_HC)' --make -o setup Setup.lhs -v0
+ '$(TEST_HC)' $(TEST_HC_OPTS) --make -o setup Setup.lhs -v0
'$(GHC_PKG)' init local.db
# We don't make use of -rtsopts in this test, and if it's enabled then
diff --git a/testsuite/tests/cabal/cabal01/all.T b/testsuite/tests/cabal/cabal01/all.T
index 8da74f5eed..9bf2eb13d5 100644
--- a/testsuite/tests/cabal/cabal01/all.T
+++ b/testsuite/tests/cabal/cabal01/all.T
@@ -24,5 +24,5 @@ def ignoreLdOutput(str):
test('cabal01',
[extra_files(['A.hs', 'B/', 'MainA.hs', 'Setup.lhs', 'c_src/', 'hello.c', 'test.cabal']),
normalise_errmsg_fun(ignoreLdOutput)],
- run_command,
+ run_command,
['$MAKE -s --no-print-directory cabal01 VANILLA=' + vanilla + ' PROF=' + prof + ' DYN=' + dyn + ' ' + cleanup])
diff --git a/testsuite/tests/cabal/cabal03/Makefile b/testsuite/tests/cabal/cabal03/Makefile
index 93589e89b0..1e948cf7bf 100644
--- a/testsuite/tests/cabal/cabal03/Makefile
+++ b/testsuite/tests/cabal/cabal03/Makefile
@@ -18,7 +18,7 @@ SETUP=../Setup -v0
cabal03: clean
$(MAKE) -s --no-print-directory clean
'$(GHC_PKG)' init tmp.d
- '$(TEST_HC)' -v0 --make Setup
+ '$(TEST_HC)' $(TEST_HC_OPTS) -v0 --make Setup
cd p && $(SETUP) clean
cd p && $(SETUP) configure $(CABAL_MINIMAL_BUILD) --with-ghc='$(TEST_HC)' --ghc-options='$(TEST_HC_OPTS)' --package-db=../tmp.d --disable-optimisation --ghc-pkg-option=--force --ipid p-noopt
cd p && $(SETUP) build
diff --git a/testsuite/tests/cabal/cabal04/Makefile b/testsuite/tests/cabal/cabal04/Makefile
index 408a725717..e9366fa349 100644
--- a/testsuite/tests/cabal/cabal04/Makefile
+++ b/testsuite/tests/cabal/cabal04/Makefile
@@ -12,7 +12,7 @@ SETUP=./Setup -v0
cabal04:
$(MAKE) -s --no-print-directory clean
- '$(TEST_HC)' -v0 --make Setup
+ '$(TEST_HC)' $(TEST_HC_OPTS) -v0 --make Setup
$(SETUP) clean
$(SETUP) configure --with-ghc='$(TEST_HC)' --ghc-options='$(filter-out -rtsopts,$(TEST_HC_OPTS))' $(VANILLA) $(PROF) $(DYN)
$(SETUP) build 2> err
diff --git a/testsuite/tests/cabal/cabal05/Makefile b/testsuite/tests/cabal/cabal05/Makefile
index 981ee6f91c..2651e35a67 100644
--- a/testsuite/tests/cabal/cabal05/Makefile
+++ b/testsuite/tests/cabal/cabal05/Makefile
@@ -29,7 +29,7 @@ SETUP = ../Setup -v0
cabal05: clean
$(MAKE) -s --no-print-directory clean
'$(GHC_PKG)' init tmp.d
- '$(TEST_HC)' -v0 --make Setup
+ '$(TEST_HC)' $(TEST_HC_OPTS) -v0 --make Setup
# build p
cd p && $(SETUP) clean
cd p && $(SETUP) configure $(CABAL_MINIMAL_BUILD) --with-ghc='$(TEST_HC)' --ghc-options='$(TEST_HC_OPTS)' --package-db=../tmp.d --prefix='$(PWD)/$$pkgid'
diff --git a/testsuite/tests/cabal/cabal06/Makefile b/testsuite/tests/cabal/cabal06/Makefile
index c42c5fb24f..842378f64e 100644
--- a/testsuite/tests/cabal/cabal06/Makefile
+++ b/testsuite/tests/cabal/cabal06/Makefile
@@ -24,7 +24,7 @@ SETUP=../Setup -v0
cabal06: clean
$(MAKE) -s --no-print-directory clean
'$(GHC_PKG)' init tmp.d
- '$(TEST_HC)' -v0 --make Setup
+ '$(TEST_HC)' $(TEST_HC_OPTS) -v0 --make Setup
cd p-1.0 && $(SETUP) clean
cd p-1.0 && $(SETUP) configure $(CABAL_MINIMAL_BUILD) --with-ghc='$(TEST_HC)' --ghc-options='$(TEST_HC_OPTS)' --package-db=../tmp.d --prefix='$(PWD)/inst-a' --ghc-pkg-options='--enable-multi-instance'
cd p-1.0 && $(SETUP) build
diff --git a/testsuite/tests/cabal/cabal08/Makefile b/testsuite/tests/cabal/cabal08/Makefile
index fb217ef199..8b9a292ce8 100644
--- a/testsuite/tests/cabal/cabal08/Makefile
+++ b/testsuite/tests/cabal/cabal08/Makefile
@@ -9,7 +9,7 @@ cabal08: clean
$(MAKE) -s --no-print-directory clean
'$(GHC_PKG)' init tmp1.d
'$(GHC_PKG)' init tmp2.d
- '$(TEST_HC)' -v0 --make Setup
+ '$(TEST_HC)' $(TEST_HC_OPTS) -v0 --make Setup
cd p1 && $(SETUP) clean
cd p1 && $(SETUP) configure $(CABAL_MINIMAL_BUILD) --with-ghc='$(TEST_HC)' --ghc-options='$(TEST_HC_OPTS)' --package-db=../tmp1.d --prefix='$(PWD)/inst-p1' --ipid="p-0.1-aaa"
cd p1 && $(SETUP) build
diff --git a/testsuite/tests/cabal/cabal09/Makefile b/testsuite/tests/cabal/cabal09/Makefile
index e89c2eaf55..68331c1472 100644
--- a/testsuite/tests/cabal/cabal09/Makefile
+++ b/testsuite/tests/cabal/cabal09/Makefile
@@ -9,7 +9,7 @@ SETUP = ./Setup -v0
cabal09: clean
$(MAKE) clean
- '$(TEST_HC)' -v0 --make Setup
+ '$(TEST_HC)' $(TEST_HC_OPTS) -v0 --make Setup
$(SETUP) clean
$(SETUP) configure $(CABAL_MINIMAL_BUILD) --with-ghc='$(TEST_HC)' --ghc-options='$(TEST_HC_OPTS)'
$(SETUP) build
diff --git a/testsuite/tests/cabal/ghcpkg01.stdout b/testsuite/tests/cabal/ghcpkg01.stdout
index 7077b3507b..4523e2807b 100644
--- a/testsuite/tests/cabal/ghcpkg01.stdout
+++ b/testsuite/tests/cabal/ghcpkg01.stdout
@@ -8,20 +8,17 @@ key: testpkg-1.2.3.4-XXX
license: BSD3
copyright: (c) The Univsersity of Glasgow 2004
maintainer: glasgow-haskell-users@haskell.org
+author: simonmar@microsoft.com
stability: stable
homepage: http://www.haskell.org/ghc
package-url: http://www.haskell.org/ghc
description:
A Test Package
category: none
-author: simonmar@microsoft.com
exposed: True
-indefinite: False
exposed-modules:
A
hidden-modules: B C.D
-abi:
-trusted: False
import-dirs: /usr/local/lib/testpkg "c:/Program Files/testpkg"
library-dirs: /usr/local/lib/testpkg "c:/Program Files/testpkg"
hs-libraries: testpkg-1.2.3.4-XXX
@@ -35,20 +32,17 @@ key: testpkg-1.2.3.4-XXX
license: BSD3
copyright: (c) The Univsersity of Glasgow 2004
maintainer: glasgow-haskell-users@haskell.org
+author: simonmar@microsoft.com
stability: stable
homepage: http://www.haskell.org/ghc
package-url: http://www.haskell.org/ghc
description:
A Test Package
category: none
-author: simonmar@microsoft.com
exposed: True
-indefinite: False
exposed-modules:
A
hidden-modules: B C.D
-abi:
-trusted: False
import-dirs: /usr/local/lib/testpkg "c:/Program Files/testpkg"
library-dirs: /usr/local/lib/testpkg "c:/Program Files/testpkg"
hs-libraries: testpkg-1.2.3.4-XXX
@@ -68,20 +62,16 @@ key: testpkg-2.0-XXX
license: BSD3
copyright: (c) The Univsersity of Glasgow 2004
maintainer: glasgow-haskell-users@haskell.org
+author: simonmar@microsoft.com
stability: unstable
homepage: http://www.haskell.org/ghc
package-url: http://www.haskell.org/ghc
description:
A Test Package (new version)
category: none
-author: simonmar@microsoft.com
-exposed: False
-indefinite: False
exposed-modules:
A
hidden-modules: B C.D C.E
-abi:
-trusted: False
import-dirs: /usr/local/lib/testpkg "c:/Program Files/testpkg"
library-dirs: /usr/local/lib/testpkg "c:/Program Files/testpkg"
hs-libraries: testpkg-2.0-XXX
@@ -95,20 +85,16 @@ key: testpkg-2.0-XXX
license: BSD3
copyright: (c) The Univsersity of Glasgow 2004
maintainer: glasgow-haskell-users@haskell.org
+author: simonmar@microsoft.com
stability: unstable
homepage: http://www.haskell.org/ghc
package-url: http://www.haskell.org/ghc
description:
A Test Package (new version)
category: none
-author: simonmar@microsoft.com
-exposed: False
-indefinite: False
exposed-modules:
A
hidden-modules: B C.D C.E
-abi:
-trusted: False
import-dirs: /usr/local/lib/testpkg "c:/Program Files/testpkg"
library-dirs: /usr/local/lib/testpkg "c:/Program Files/testpkg"
hs-libraries: testpkg-2.0-XXX
@@ -122,20 +108,17 @@ key: testpkg-1.2.3.4-XXX
license: BSD3
copyright: (c) The Univsersity of Glasgow 2004
maintainer: glasgow-haskell-users@haskell.org
+author: simonmar@microsoft.com
stability: stable
homepage: http://www.haskell.org/ghc
package-url: http://www.haskell.org/ghc
description:
A Test Package
category: none
-author: simonmar@microsoft.com
exposed: True
-indefinite: False
exposed-modules:
A
hidden-modules: B C.D
-abi:
-trusted: False
import-dirs: /usr/local/lib/testpkg "c:/Program Files/testpkg"
library-dirs: /usr/local/lib/testpkg "c:/Program Files/testpkg"
hs-libraries: testpkg-1.2.3.4-XXX
@@ -156,20 +139,16 @@ key: testpkg-1.2.3.4-XXX
license: BSD3
copyright: (c) The Univsersity of Glasgow 2004
maintainer: glasgow-haskell-users@haskell.org
+author: simonmar@microsoft.com
stability: stable
homepage: http://www.haskell.org/ghc
package-url: http://www.haskell.org/ghc
description:
A Test Package
category: none
-author: simonmar@microsoft.com
-exposed: False
-indefinite: False
exposed-modules:
A
hidden-modules: B C.D
-abi:
-trusted: False
import-dirs: /usr/local/lib/testpkg "c:/Program Files/testpkg"
library-dirs: /usr/local/lib/testpkg "c:/Program Files/testpkg"
hs-libraries: testpkg-1.2.3.4-XXX
View Lorry Controller Status