diff options
author | Herbert Valerio Riedel <hvr@gnu.org> | 2014-10-28 10:42:34 +0100 |
---|---|---|
committer | Herbert Valerio Riedel <hvr@gnu.org> | 2014-10-28 10:42:34 +0100 |
commit | 63918e6d7f048597ae8f61c6297a7b700630a819 (patch) | |
tree | 7b6c1042d9f021e93e7576614ee14166df2211e4 /testsuite/tests/safeHaskell | |
parent | aa2ceba33a8b98a2e8020464684f2eef7c98acf1 (diff) | |
download | haskell-63918e6d7f048597ae8f61c6297a7b700630a819.tar.gz |
Add n-ary version of `two_normalisers` to testsuite lib
This is more readable than nesting `two_normalisers()`-invocations
Diffstat (limited to 'testsuite/tests/safeHaskell')
-rw-r--r-- | testsuite/tests/safeHaskell/check/pkg01/all.T | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/testsuite/tests/safeHaskell/check/pkg01/all.T b/testsuite/tests/safeHaskell/check/pkg01/all.T index 8b33f27297..5b2839d9c1 100644 --- a/testsuite/tests/safeHaskell/check/pkg01/all.T +++ b/testsuite/tests/safeHaskell/check/pkg01/all.T @@ -8,6 +8,9 @@ def normaliseArrayPackage(str): def normaliseBytestringPackage(str): return re.sub('bytestring-[0-9]+(\.[0-9]+)*', 'bytestring-<VERSION>', str) +def normaliseIntegerPackage(str): + return re.sub('integer-(gmp|simple)-[0-9.]+', 'integer-<IMPL>-<VERSION>', str) + def normaliseArrayPackageKey(str): return re.sub('array_[A-Za-z0-9]+', 'array_<HASH>', str) @@ -38,10 +41,11 @@ make_args = 'VANILLA=' + vanilla + ' PROF=' + prof + ' DYN=' + dyn test('safePkg01', [clean_cmd('$MAKE -s --no-print-directory cleanPackageDatabase.safePkg01'), normalise_errmsg_fun(ignoreLdOutput), - normalise_fun(two_normalisers(two_normalisers(normaliseArrayPackage, - normaliseArrayPackageKey), - normaliseBytestringPackage))], - run_command, + normalise_fun(join_normalisers( + normaliseArrayPackage, + normaliseArrayPackageKey, + normaliseBytestringPackage))], + run_command, ['$MAKE -s --no-print-directory safePkg01 ' + make_args]) # Fail since we enable package trust |