diff options
| author | Ian Lynagh <igloo@earth.li> | 2007-07-21 21:58:16 +0000 |
|---|---|---|
| committer | Ian Lynagh <igloo@earth.li> | 2007-07-21 21:58:16 +0000 |
| commit | 6a28cc169e6a7ac438523b6e45a1052b3d41ee64 (patch) | |
| tree | 639749f3835eea766deeb6b7bdedb41ed39caca9 /testsuite/tests/ghc-regress/rename/prog006 | |
| parent | 5882c76bae74ae7e5fd631790312aa35c060bd04 (diff) | |
| download | haskell-6a28cc169e6a7ac438523b6e45a1052b3d41ee64.tar.gz | |
Share the pwd program between tests
Diffstat (limited to 'testsuite/tests/ghc-regress/rename/prog006')
| -rw-r--r-- | testsuite/tests/ghc-regress/rename/prog006/Makefile | 3 | ||||
| -rw-r--r-- | testsuite/tests/ghc-regress/rename/prog006/pwd.hs | 15 |
2 files changed, 1 insertions, 17 deletions
diff --git a/testsuite/tests/ghc-regress/rename/prog006/Makefile b/testsuite/tests/ghc-regress/rename/prog006/Makefile index 3f45f4f3ec..54bf675788 100644 --- a/testsuite/tests/ghc-regress/rename/prog006/Makefile +++ b/testsuite/tests/ghc-regress/rename/prog006/Makefile @@ -16,9 +16,8 @@ include $(TOP)/mk/test.mk # using the supplied Cabal configuration. rn.prog006: - $(TEST_HC) -v0 pwd.hs -o pwd $(TEST_HC) --make -package-name test-1.0 B.C -no-recomp -v0 - sed "s@__IMPORT__@`./pwd`@" <pkg.conf.in >pkg.conf + sed "s@__IMPORT__@`$(TOP)/utils/pwd quadruple-backslash`@" <pkg.conf.in >pkg.conf $(TEST_HC) -c -package-conf pkg.conf -package test -no-recomp A.hs -i # The -i clears the search path, so A.hs will find B.C from package test # diff --git a/testsuite/tests/ghc-regress/rename/prog006/pwd.hs b/testsuite/tests/ghc-regress/rename/prog006/pwd.hs deleted file mode 100644 index f587d08bbd..0000000000 --- a/testsuite/tests/ghc-regress/rename/prog006/pwd.hs +++ /dev/null @@ -1,15 +0,0 @@ - -module Main where - -import System.Directory - -main :: IO () -main = do d <- getCurrentDirectory - putStr $ concatMap escape d - --- We have to escape \ twice, once to get through sed and again to get --- through parsing pkg.conf -escape :: Char -> String -escape '\\' = "\\\\\\\\" -escape c = [c] - |