diff options
Diffstat (limited to 'testsuite/tests/safeHaskell/check/pkg01/all.T')
| -rw-r--r-- | testsuite/tests/safeHaskell/check/pkg01/all.T | 37 |
1 files changed, 11 insertions, 26 deletions
diff --git a/testsuite/tests/safeHaskell/check/pkg01/all.T b/testsuite/tests/safeHaskell/check/pkg01/all.T index 49e4ec20f1..cd89b88ce2 100644 --- a/testsuite/tests/safeHaskell/check/pkg01/all.T +++ b/testsuite/tests/safeHaskell/check/pkg01/all.T @@ -27,13 +27,10 @@ make_args = 'VANILLA=' + vanilla + ' PROF=' + prof + ' DYN=' + dyn # Test building a package, that trust values are set correctly # and can be changed correctly test('safePkg01', - [clean_cmd('$MAKE -s --no-print-directory cleanPackageDatabase.safePkg01'), - normalise_errmsg_fun(ignoreLdOutput), + [normalise_errmsg_fun(ignoreLdOutput), normalise_version("array", "integer-gmp", "integer-simple", "bytestring", - "base", "deepseq", "ghc-prim"), - ], - run_command, - ['$MAKE -s --no-print-directory safePkg01 ' + make_args]) + "base", "deepseq", "ghc-prim")], + run_command, ['$MAKE -s --no-print-directory safePkg01 ' + make_args]) # Fail since we enable package trust test('ImpSafe01', normal, compile_fail, ['-fpackage-trust -distrust base']) @@ -53,67 +50,55 @@ test('ImpSafe03', test('ImpSafe04', normal, compile_fail, ['-fpackage-trust -distrust base']) test('ImpSafeOnly01', - [pre_cmd('$MAKE -s --no-print-directory mkPackageDatabase.ImpSafeOnly01 ' + make_args), - clean_cmd('$MAKE -s --no-print-directory cleanPackageDatabase.ImpSafeOnly01')], + [pre_cmd('$MAKE -s --no-print-directory mkPackageDatabase.ImpSafeOnly01 ' + make_args)], compile, ['-fpackage-trust -package-db pdb.ImpSafeOnly01/local.db -trust base']) test('ImpSafeOnly02', - [pre_cmd('$MAKE -s --no-print-directory mkPackageDatabase.ImpSafeOnly02 ' + make_args), - clean_cmd('$MAKE -s --no-print-directory cleanPackageDatabase.ImpSafeOnly02')], + [pre_cmd('$MAKE -s --no-print-directory mkPackageDatabase.ImpSafeOnly02 ' + make_args)], compile, ['-fpackage-trust -package-db pdb.ImpSafeOnly02/local.db -trust base -trust safePkg01']) # Fail since we enable package trust (and still need safePkg01 trusted) test('ImpSafeOnly03', - [pre_cmd('$MAKE -s --no-print-directory mkPackageDatabase.ImpSafeOnly03 ' + make_args), - clean_cmd('$MAKE -s --no-print-directory cleanPackageDatabase.ImpSafeOnly03')], + [pre_cmd('$MAKE -s --no-print-directory mkPackageDatabase.ImpSafeOnly03 ' + make_args)], compile_fail, ['-fpackage-trust -package-db pdb.ImpSafeOnly03/local.db -trust base']) # Succeed since we don't enable package trust test('ImpSafeOnly04', - [pre_cmd('$MAKE -s --no-print-directory mkPackageDatabase.ImpSafeOnly04 ' + make_args), - clean_cmd('$MAKE -s --no-print-directory cleanPackageDatabase.ImpSafeOnly04')], - compile, - ['-package-db pdb.ImpSafeOnly04/local.db -trust base']) + [pre_cmd('$MAKE -s --no-print-directory mkPackageDatabase.ImpSafeOnly04 ' + make_args)], + compile, ['-package-db pdb.ImpSafeOnly04/local.db -trust base']) # fail due to missing trust of safePkg01, next test succeeds. test('ImpSafeOnly05', - [pre_cmd('$MAKE -s --no-print-directory mkPackageDatabase.ImpSafeOnly05 ' + make_args), - clean_cmd('$MAKE -s --no-print-directory cleanPackageDatabase.ImpSafeOnly05')], + [pre_cmd('$MAKE -s --no-print-directory mkPackageDatabase.ImpSafeOnly05 ' + make_args)], compile_fail, ['-fpackage-trust -package-db pdb.ImpSafeOnly05/local.db -trust base']) test('ImpSafeOnly06', - [pre_cmd('$MAKE -s --no-print-directory mkPackageDatabase.ImpSafeOnly06 ' + make_args), - clean_cmd('$MAKE -s --no-print-directory cleanPackageDatabase.ImpSafeOnly06')], + [pre_cmd('$MAKE -s --no-print-directory mkPackageDatabase.ImpSafeOnly06 ' + make_args)], compile, ['-fpackage-trust -package-db pdb.ImpSafeOnly06/local.db -trust base -trust safePkg01']) # fail due to missing trust test('ImpSafeOnly07', [pre_cmd('$MAKE -s --no-print-directory mkPackageDatabase.ImpSafeOnly07 ' + make_args), - clean_cmd('$MAKE -s --no-print-directory cleanPackageDatabase.ImpSafeOnly07'), normalise_version("bytestring", "base")], compile_fail, ['-fpackage-trust -package-db pdb.ImpSafeOnly07/local.db -trust safePkg01 -distrust bytestring']) test('ImpSafeOnly08', [pre_cmd('$MAKE -s --no-print-directory mkPackageDatabase.ImpSafeOnly08 ' + make_args), - clean_cmd('$MAKE -s --no-print-directory cleanPackageDatabase.ImpSafeOnly08'), normalise_version("bytestring", "base")], compile_fail, ['-fpackage-trust -package-db pdb.ImpSafeOnly08/local.db -trust safePkg01']) test('ImpSafeOnly09', [pre_cmd('$MAKE -s --no-print-directory mkPackageDatabase.ImpSafeOnly09 ' + make_args), - clean_cmd('$MAKE -s --no-print-directory cleanPackageDatabase.ImpSafeOnly09'), normalise_version("bytestring")], compile_fail, ['-fpackage-trust -package-db pdb.ImpSafeOnly09/local.db -trust safePkg01']) # finally succeed test('ImpSafeOnly10', - [pre_cmd('$MAKE -s --no-print-directory mkPackageDatabase.ImpSafeOnly10 ' + make_args), - clean_cmd('$MAKE -s --no-print-directory cleanPackageDatabase.ImpSafeOnly10')], + [pre_cmd('$MAKE -s --no-print-directory mkPackageDatabase.ImpSafeOnly10 ' + make_args)], compile, ['-fpackage-trust -package-db pdb.ImpSafeOnly10/local.db -trust safePkg01 -trust base -trust bytestring']) - |