[commit: ghc] master: Updates to safePkg01 under Edward's guidance (2f0d841)
git at git.haskell.org
git at git.haskell.org
Tue Nov 4 10:39:19 UTC 2014
Repository : ssh://git@git.haskell.org/ghc
On branch : master
Link : http://ghc.haskell.org/trac/ghc/changeset/2f0d84164006665cd7c89cc77c1c1896a6ff0bcf/ghc
>---------------------------------------------------------------
commit 2f0d84164006665cd7c89cc77c1c1896a6ff0bcf
Author: Simon Peyton Jones <simonpj at microsoft.com>
Date: Tue Nov 4 08:36:17 2014 +0000
Updates to safePkg01 under Edward's guidance
>---------------------------------------------------------------
2f0d84164006665cd7c89cc77c1c1896a6ff0bcf
testsuite/tests/safeHaskell/check/pkg01/Makefile | 17 +++++++++--------
testsuite/tests/safeHaskell/check/pkg01/all.T | 4 ----
.../tests/safeHaskell/check/pkg01/safePkg01.stdout | 16 ++++++++--------
3 files changed, 17 insertions(+), 20 deletions(-)
diff --git a/testsuite/tests/safeHaskell/check/pkg01/Makefile b/testsuite/tests/safeHaskell/check/pkg01/Makefile
index 19e1106..a53b4e6 100644
--- a/testsuite/tests/safeHaskell/check/pkg01/Makefile
+++ b/testsuite/tests/safeHaskell/check/pkg01/Makefile
@@ -36,6 +36,7 @@ mkPackageDatabase.%:
safePkg01_GHC_PKG = '$(GHC_PKG)' --no-user-package-db -f pdb.safePkg01/local.db
+SHOW_IFACE=-dppr-cols999 --show-iface
safePkg01:
'$(MAKE)' mkPackageDatabase.safePkg01
@@ -43,28 +44,28 @@ safePkg01:
$(safePkg01_GHC_PKG) field safePkg01-1.0 trusted
echo
echo 'M_SafePkg'
- '$(TEST_HC)' --show-iface pdb.safePkg01/dist/build/M_SafePkg.$(HI_SUF) | grep -E '^package dependencies:|^trusted:|^require own pkg trusted:'
+ '$(TEST_HC)' $(SHOW_IFACE) pdb.safePkg01/dist/build/M_SafePkg.$(HI_SUF) | grep -E '^package dependencies:|^trusted:|^require own pkg trusted:'
echo
echo 'M_SafePkg2'
- '$(TEST_HC)' --show-iface pdb.safePkg01/dist/build/M_SafePkg2.$(HI_SUF) | grep -E '^package dependencies:|^trusted:|^require own pkg trusted:'
+ '$(TEST_HC)' $(SHOW_IFACE) pdb.safePkg01/dist/build/M_SafePkg2.$(HI_SUF) | grep -E '^package dependencies:|^trusted:|^require own pkg trusted:'
echo
echo 'M_SafePkg3'
- '$(TEST_HC)' --show-iface pdb.safePkg01/dist/build/M_SafePkg3.$(HI_SUF) | grep -E '^package dependencies:|^trusted:|^require own pkg trusted:'
+ '$(TEST_HC)' $(SHOW_IFACE) pdb.safePkg01/dist/build/M_SafePkg3.$(HI_SUF) | grep -E '^package dependencies:|^trusted:|^require own pkg trusted:'
echo
echo 'M_SafePkg4'
- '$(TEST_HC)' --show-iface pdb.safePkg01/dist/build/M_SafePkg4.$(HI_SUF) | grep -E '^package dependencies:|^trusted:|^require own pkg trusted:'
+ '$(TEST_HC)' $(SHOW_IFACE) pdb.safePkg01/dist/build/M_SafePkg4.$(HI_SUF) | grep -E '^package dependencies:|^trusted:|^require own pkg trusted:'
echo
echo 'M_SafePkg5'
- '$(TEST_HC)' --show-iface pdb.safePkg01/dist/build/M_SafePkg5.$(HI_SUF) | grep -E '^package dependencies:|^trusted:|^require own pkg trusted:'
+ '$(TEST_HC)' $(SHOW_IFACE) pdb.safePkg01/dist/build/M_SafePkg5.$(HI_SUF) | grep -E '^package dependencies:|^trusted:|^require own pkg trusted:'
echo
echo 'M_SafePkg6'
- '$(TEST_HC)' --show-iface pdb.safePkg01/dist/build/M_SafePkg6.$(HI_SUF) | grep -E '^package dependencies:|^trusted:|^require own pkg trusted:'
+ '$(TEST_HC)' $(SHOW_IFACE) pdb.safePkg01/dist/build/M_SafePkg6.$(HI_SUF) | grep -E '^package dependencies:|^trusted:|^require own pkg trusted:'
echo
echo 'M_SafePkg7'
- '$(TEST_HC)' --show-iface pdb.safePkg01/dist/build/M_SafePkg7.$(HI_SUF) | grep -E '^package dependencies:|^trusted:|^require own pkg trusted:'
+ '$(TEST_HC)' $(SHOW_IFACE) pdb.safePkg01/dist/build/M_SafePkg7.$(HI_SUF) | grep -E '^package dependencies:|^trusted:|^require own pkg trusted:'
echo
echo 'M_SafePkg8'
- '$(TEST_HC)' --show-iface pdb.safePkg01/dist/build/M_SafePkg8.$(HI_SUF) | grep -E '^package dependencies:|^trusted:|^require own pkg trusted:'
+ '$(TEST_HC)' $(SHOW_IFACE) pdb.safePkg01/dist/build/M_SafePkg8.$(HI_SUF) | grep -E '^package dependencies:|^trusted:|^require own pkg trusted:'
echo
echo 'Testing setting trust'
$(safePkg01_GHC_PKG) trust safePkg01-1.0
diff --git a/testsuite/tests/safeHaskell/check/pkg01/all.T b/testsuite/tests/safeHaskell/check/pkg01/all.T
index 732f6fb..604a5cc 100644
--- a/testsuite/tests/safeHaskell/check/pkg01/all.T
+++ b/testsuite/tests/safeHaskell/check/pkg01/all.T
@@ -11,9 +11,6 @@ def normaliseBytestringPackage(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)
-
def ignoreLdOutput(str):
return re.sub('Creating library file: pdb.safePkg01/dist.build.libHSsafePkg01-1.0-ghc[0-9.]*.dll.a\n', '', str)
@@ -43,7 +40,6 @@ test('safePkg01',
normalise_errmsg_fun(ignoreLdOutput),
normalise_fun(
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 62074de..44ea89f 100644
--- a/testsuite/tests/safeHaskell/check/pkg01/safePkg01.stdout
+++ b/testsuite/tests/safeHaskell/check/pkg01/safePkg01.stdout
@@ -4,42 +4,42 @@ pdb.safePkg01/local.db:
trusted: False
M_SafePkg
-package dependencies: base-4.8.0.0* ghc-prim-0.3.1.0
+package dependencies: base-4.8.0.0* ghc-prim-0.3.1.0 integer-gmp-0.5.1.0
trusted: safe
require own pkg trusted: False
M_SafePkg2
-package dependencies: base-4.8.0.0 ghc-prim-0.3.1.0
+package dependencies: base-4.8.0.0 ghc-prim-0.3.1.0 integer-gmp-0.5.1.0
trusted: trustworthy
require own pkg trusted: False
M_SafePkg3
-package dependencies: base-4.8.0.0* ghc-prim-0.3.1.0
+package dependencies: base-4.8.0.0* ghc-prim-0.3.1.0 integer-gmp-0.5.1.0
trusted: safe
require own pkg trusted: True
M_SafePkg4
-package dependencies: base-4.8.0.0* ghc-prim-0.3.1.0
+package dependencies: base-4.8.0.0* ghc-prim-0.3.1.0 integer-gmp-0.5.1.0
trusted: safe
require own pkg trusted: True
M_SafePkg5
-package dependencies: base-4.8.0.0* ghc-prim-0.3.1.0
+package dependencies: base-4.8.0.0* ghc-prim-0.3.1.0 integer-gmp-0.5.1.0
trusted: safe
require own pkg trusted: True
M_SafePkg6
-package dependencies: array-0.5.0.1 at array_<HASH>
+package dependencies: array-0.5.0.1 base-4.8.0.0* bytestring-0.10.4.0* deepseq-1.3.0.3 ghc-prim-0.3.1.0 integer-gmp-0.5.1.0
trusted: trustworthy
require own pkg trusted: False
M_SafePkg7
-package dependencies: array-0.5.0.1 at array_<HASH>
+package dependencies: array-0.5.0.1 base-4.8.0.0* bytestring-0.10.4.0* deepseq-1.3.0.3 ghc-prim-0.3.1.0 integer-gmp-0.5.1.0
trusted: safe
require own pkg trusted: False
M_SafePkg8
-package dependencies: array-0.5.0.1 at array_<HASH>
+package dependencies: array-0.5.0.1 base-4.8.0.0 bytestring-0.10.4.0* deepseq-1.3.0.3 ghc-prim-0.3.1.0 integer-gmp-0.5.1.0
trusted: trustworthy
require own pkg trusted: False
More information about the ghc-commits
mailing list