diff options
| author | Edward Z. Yang <ezyang@cs.stanford.edu> | 2014-10-27 17:52:39 -0700 |
|---|---|---|
| committer | Edward Z. Yang <ezyang@cs.stanford.edu> | 2014-10-27 17:52:39 -0700 |
| commit | aa2ceba33a8b98a2e8020464684f2eef7c98acf1 (patch) | |
| tree | 6af11cdafcfd905118af69c1cba09e07e06deb8d /testsuite/tests/safeHaskell/check | |
| parent | 187450131877aef159fbfcdda0a5117f779f1688 (diff) | |
| download | haskell-aa2ceba33a8b98a2e8020464684f2eef7c98acf1.tar.gz | |
Normalise package key hash to make tests less fragile.
Signed-off-by: Edward Z. Yang <ezyang@cs.stanford.edu>
Diffstat (limited to 'testsuite/tests/safeHaskell/check')
| -rw-r--r-- | testsuite/tests/safeHaskell/check/pkg01/all.T | 6 | ||||
| -rw-r--r-- | testsuite/tests/safeHaskell/check/pkg01/safePkg01.stdout | 6 |
2 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 08f0b61820..8b33f27297 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 normaliseArrayPackageKey(str): + return re.sub('array_[A-Za-z0-9]+', 'array_<HASH>', str) + def ignoreLdOutput(str): return re.sub('Creating library file: pdb.safePkg01/dist.build.libHSsafePkg01-1.0-ghc[0-9.]*.dll.a\n', '', str) @@ -35,7 +38,8 @@ 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(normaliseArrayPackage, + normalise_fun(two_normalisers(two_normalisers(normaliseArrayPackage, + normaliseArrayPackageKey), normaliseBytestringPackage))], run_command, ['$MAKE -s --no-print-directory safePkg01 ' + make_args]) diff --git a/testsuite/tests/safeHaskell/check/pkg01/safePkg01.stdout b/testsuite/tests/safeHaskell/check/pkg01/safePkg01.stdout index 7ce7704d23..62074dedab 100644 --- a/testsuite/tests/safeHaskell/check/pkg01/safePkg01.stdout +++ b/testsuite/tests/safeHaskell/check/pkg01/safePkg01.stdout @@ -29,17 +29,17 @@ trusted: safe require own pkg trusted: True M_SafePkg6 -package dependencies: array-0.5.0.1@array_GX4NwjS8xZkC2ZPtjgwhnz +package dependencies: array-0.5.0.1@array_<HASH> trusted: trustworthy require own pkg trusted: False M_SafePkg7 -package dependencies: array-0.5.0.1@array_GX4NwjS8xZkC2ZPtjgwhnz +package dependencies: array-0.5.0.1@array_<HASH> trusted: safe require own pkg trusted: False M_SafePkg8 -package dependencies: array-0.5.0.1@array_GX4NwjS8xZkC2ZPtjgwhnz +package dependencies: array-0.5.0.1@array_<HASH> trusted: trustworthy require own pkg trusted: False |