diff options
Diffstat (limited to 'testsuite/tests/cabal/all.T')
| -rw-r--r-- | testsuite/tests/cabal/all.T | 25 |
1 files changed, 14 insertions, 11 deletions
diff --git a/testsuite/tests/cabal/all.T b/testsuite/tests/cabal/all.T index fc7269c4f3..23c4826e35 100644 --- a/testsuite/tests/cabal/all.T +++ b/testsuite/tests/cabal/all.T @@ -1,14 +1,15 @@ def normaliseDynlibNames(str): return re.sub('-ghc[0-9.]+\.', '-ghc<VERSION>.', str) -test('ghcpkg01', [], run_command, ['$MAKE -s --no-print-directory ghcpkg01']) +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): # warning: haddock-interfaces .. doesn't exist or isn't a file test('ghcpkg02', [ignore_stderr], run_command, ['$MAKE -s --no-print-directory ghcpkg02']) -test('ghcpkg03', [normalise_errmsg_fun(normaliseDynlibNames)], run_command, +test('ghcpkg03', [extra_files(['test.pkg', 'test2.pkg', 'test4.pkg']), + normalise_errmsg_fun(normaliseDynlibNames)], run_command, ['$MAKE -s --no-print-directory ghcpkg03']) def normalise_package_order(s): @@ -17,7 +18,8 @@ def normalise_package_order(s): 'newtestpkg-2.0 testpkg-1.2.3.4', s) -test('ghcpkg04', [normalise_errmsg_fun(normalise_package_order)], run_command, +test('ghcpkg04', [extra_files(['test.pkg', 'test5.pkg']), + normalise_errmsg_fun(normalise_package_order)], run_command, ['$MAKE -s --no-print-directory ghcpkg04']) # Sometimes we get spurious warnings from ghc-pkg about missing @@ -26,11 +28,12 @@ def normalise_haddock_junk( str ): return re.sub(r'Warning: haddock.*\n', '', str) test('ghcpkg05', - [normalise_errmsg_fun(normalise_haddock_junk, normaliseDynlibNames)], + [extra_files(['test2.pkg', 'test3.pkg']), + normalise_errmsg_fun(normalise_haddock_junk, normaliseDynlibNames)], run_command, ['$MAKE -s --no-print-directory ghcpkg05']) -test('ghcpkg06', [], run_command, ['$MAKE -s --no-print-directory ghcpkg06']) +test('ghcpkg06', [extra_files(['test.pkg', 'testdup.pkg'])], run_command, ['$MAKE -s --no-print-directory ghcpkg06']) -test('ghcpkg07', [], run_command, ['$MAKE -s --no-print-directory ghcpkg07']) +test('ghcpkg07', [extra_files(['test.pkg', 'test7a.pkg', 'test7b.pkg'])], run_command, ['$MAKE -s --no-print-directory ghcpkg07']) # Test that we *can* compile a module that also belongs to a package # (this was disallowed in GHC 6.4 and earlier) @@ -38,14 +41,14 @@ test('pkg01', normal, compile, ['']) test('T1750', [], run_command, ['$MAKE -s --no-print-directory T1750']) -test('T5442a', [], run_command, ['$MAKE -s --no-print-directory T5442a']) +test('T5442a', [extra_files(['test.pkg'])], run_command, ['$MAKE -s --no-print-directory T5442a']) -test('T5442b', [], run_command, ['$MAKE -s --no-print-directory T5442b']) +test('T5442b', [extra_files(['test.pkg'])], run_command, ['$MAKE -s --no-print-directory T5442b']) -test('T5442c', [], run_command, ['$MAKE -s --no-print-directory T5442c']) +test('T5442c', [extra_files(['test.pkg'])], run_command, ['$MAKE -s --no-print-directory T5442c']) -test('T5442d', [], run_command, ['$MAKE -s --no-print-directory T5442d']) +test('T5442d', [extra_files(['shadow1.pkg', 'shadow2.pkg', 'shadow4.pkg'])], run_command, ['$MAKE -s --no-print-directory T5442d']) test('shadow', [], run_command, ['$MAKE -s --no-print-directory shadow']) -test('T12485a', [], run_command, ['$MAKE -s --no-print-directory T12485a']) +test('T12485a', [extra_files(['shadow1.pkg', 'shadow2.pkg', 'shadow3.pkg'])], run_command, ['$MAKE -s --no-print-directory T12485a']) |