Repository : ssh://darcs.haskell.org//srv/darcs/testsuite On branch : master
http://hackage.haskell.org/trac/ghc/changeset/edf4eb6e006eba81bd760ada2659cf6dfaa8680b >--------------------------------------------------------------- commit edf4eb6e006eba81bd760ada2659cf6dfaa8680b Author: Ian Lynagh <[email protected]> Date: Wed Oct 26 00:33:42 2011 +0100 Remove cabal02 It tested cabal-setup, which no longer exists. >--------------------------------------------------------------- tests/cabal/cabal02/Makefile | 33 --------------------------------- tests/cabal/cabal02/P1/A.hs | 3 --- tests/cabal/cabal02/P1/P1.cabal | 4 ---- tests/cabal/cabal02/P2/A.hs | 3 --- tests/cabal/cabal02/P2/P2.cabal | 4 ---- tests/cabal/cabal02/Q/B.hs | 5 ----- tests/cabal/cabal02/Q/Q.cabal | 4 ---- tests/cabal/cabal02/R/Main.hs | 4 ---- tests/cabal/cabal02/R/R.cabal | 6 ------ tests/cabal/cabal02/all.T | 8 -------- 10 files changed, 0 insertions(+), 74 deletions(-) diff --git a/tests/cabal/cabal02/Makefile b/tests/cabal/cabal02/Makefile deleted file mode 100644 index c7348a3..0000000 --- a/tests/cabal/cabal02/Makefile +++ /dev/null @@ -1,33 +0,0 @@ -TOP=../../.. -include $(TOP)/mk/boilerplate.mk -include $(TOP)/mk/test.mk - -CABAL_SETUP = $(FPTOOLS_TOP_ABS)/libraries/Cabal/cabal-setup/cabal-setup - -CONFIG_ARGS = --with-compiler=$(TEST_HC) --ghc-options='$(TEST_HC_OPTS)' --with-hc-pkg=$(GHC_PKG) - -# We have 3 packages, P-1.0, P-2.0, and Q. Q depends on P-1.0. -# We have an executable R, that depends on P-2.0 and Q, so the resulting -# executable will link to both P-1.0 and P-2.0. - -cabal02 : - (cd P1 && $(CABAL_SETUP) configure $(CONFIG_ARGS)) - (cd P1 && $(CABAL_SETUP) build) - (cd P1 && $(CABAL_SETUP) register --inplace --user) - (cd P2 && $(CABAL_SETUP) configure $(CONFIG_ARGS)) - (cd P2 && $(CABAL_SETUP) build) - (cd P2 && $(CABAL_SETUP) register --inplace --user) - (cd Q && $(CABAL_SETUP) configure $(CONFIG_ARGS)) - (cd Q && $(CABAL_SETUP) build) - (cd Q && $(CABAL_SETUP) register --inplace --user) - (cd R && $(CABAL_SETUP) configure $(CONFIG_ARGS)) - (cd R && $(CABAL_SETUP) build) - $(MAKE) clean - -clean :: - (cd P1 && $(CABAL_SETUP) unregister --user) - (cd P2 && $(CABAL_SETUP) unregister --user) - (cd Q && $(CABAL_SETUP) unregister --user) - (cd P1 && $(CABAL_SETUP) clean) - (cd P2 && $(CABAL_SETUP) clean) - (cd Q && $(CABAL_SETUP) clean) diff --git a/tests/cabal/cabal02/P1/A.hs b/tests/cabal/cabal02/P1/A.hs deleted file mode 100644 index 411d1dd..0000000 --- a/tests/cabal/cabal02/P1/A.hs +++ /dev/null @@ -1,3 +0,0 @@ -module A where - -a = 1 :: Int diff --git a/tests/cabal/cabal02/P1/P1.cabal b/tests/cabal/cabal02/P1/P1.cabal deleted file mode 100644 index c4b2161..0000000 --- a/tests/cabal/cabal02/P1/P1.cabal +++ /dev/null @@ -1,4 +0,0 @@ -Name: P -Version: 1.0 -Exposed-Modules: A -Build-depends: base>=1.0, haskell98 diff --git a/tests/cabal/cabal02/P2/A.hs b/tests/cabal/cabal02/P2/A.hs deleted file mode 100644 index 3db5ca9..0000000 --- a/tests/cabal/cabal02/P2/A.hs +++ /dev/null @@ -1,3 +0,0 @@ -module A where - -a = 2 diff --git a/tests/cabal/cabal02/P2/P2.cabal b/tests/cabal/cabal02/P2/P2.cabal deleted file mode 100644 index 3991b20..0000000 --- a/tests/cabal/cabal02/P2/P2.cabal +++ /dev/null @@ -1,4 +0,0 @@ -Name: P -Version: 2.0 -Exposed-Modules: A -Build-depends: base>=1.0, haskell98 diff --git a/tests/cabal/cabal02/Q/B.hs b/tests/cabal/cabal02/Q/B.hs deleted file mode 100644 index 0fd13a9..0000000 --- a/tests/cabal/cabal02/Q/B.hs +++ /dev/null @@ -1,5 +0,0 @@ -module B where - -import A -- from package P - -b = a diff --git a/tests/cabal/cabal02/Q/Q.cabal b/tests/cabal/cabal02/Q/Q.cabal deleted file mode 100644 index e439f49..0000000 --- a/tests/cabal/cabal02/Q/Q.cabal +++ /dev/null @@ -1,4 +0,0 @@ -Name: Q -Version: 1.0 -Build-depends: base>=1.0, haskell98, P==1.0 -Exposed-modules: B diff --git a/tests/cabal/cabal02/R/Main.hs b/tests/cabal/cabal02/R/Main.hs deleted file mode 100644 index a6ddcdf..0000000 --- a/tests/cabal/cabal02/R/Main.hs +++ /dev/null @@ -1,4 +0,0 @@ -import A -import B - -main = do print a; print b diff --git a/tests/cabal/cabal02/R/R.cabal b/tests/cabal/cabal02/R/R.cabal deleted file mode 100644 index 73c6bfc..0000000 --- a/tests/cabal/cabal02/R/R.cabal +++ /dev/null @@ -1,6 +0,0 @@ -Name: R -Version: 1.0 -Build-depends: base>=1.0, haskell98, P==2.0, Q - -Executable: R -Main-is: Main.hs diff --git a/tests/cabal/cabal02/all.T b/tests/cabal/cabal02/all.T deleted file mode 100644 index bfa8091..0000000 --- a/tests/cabal/cabal02/all.T +++ /dev/null @@ -1,8 +0,0 @@ -# cabal-setup isn't in the GHC tree any more; this test should probably -# be moved to the cabal-setup package. -test('cabal02', - [skip, - skip_if_fast, - if_platform('i386-unknown-mingw32', expect_broken(1196))], - run_command, - ['$MAKE -s --no-print-directory cabal02']) _______________________________________________ Cvs-ghc mailing list [email protected] http://www.haskell.org/mailman/listinfo/cvs-ghc
