[commit: packages/time] master: fix tests (cec60a0)
git at git.haskell.org
git at git.haskell.org
Fri Jan 23 22:59:52 UTC 2015
Repository : ssh://git@git.haskell.org/time
On branch : master
Link : http://git.haskell.org/packages/time.git/commitdiff/cec60a0b5e84c4240d2fe0419b215f6fe3da43dc
>---------------------------------------------------------------
commit cec60a0b5e84c4240d2fe0419b215f6fe3da43dc
Author: Ashley Yakeley <ashley at semantic.org>
Date: Sat Apr 10 22:40:58 2010 -0700
fix tests
Ignore-this: 98e1f1b38f6d01fbcaff8ffbc45ec492
darcs-hash:20100411054058-ac6dd-b658c36af21af9caa015dc3fda05bad7f53457fc
>---------------------------------------------------------------
cec60a0b5e84c4240d2fe0419b215f6fe3da43dc
Makefile | 2 +-
test/AddDays.hs | 1 -
test/Makefile | 4 +---
test/TestParseTime.hs | 1 -
4 files changed, 2 insertions(+), 6 deletions(-)
diff --git a/Makefile b/Makefile
index d56bf1a..de4898f 100644
--- a/Makefile
+++ b/Makefile
@@ -11,7 +11,7 @@ configure:
build: configure
cabal build --ghc-options=-Werror
-test: build
+test: install
cabal test
haddock: configure
diff --git a/test/AddDays.hs b/test/AddDays.hs
index 719f70a..a867905 100644
--- a/test/AddDays.hs
+++ b/test/AddDays.hs
@@ -3,7 +3,6 @@
module Main where
import Data.Time.Calendar
-import Control.Monad
days ::[Day]
days =
diff --git a/test/Makefile b/test/Makefile
index ecfaa96..307adcc 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -2,9 +2,7 @@ GHC = ghc
GHCFLAGS = -package time
default:
- cd ..; runhaskell Setup.hs register --user --inplace
make CurrentTime.run ShowDST.run test
- cd ..; runhaskell Setup.hs unregister --user
TestMonthDay: TestMonthDay.o
$(GHC) $(GHCFLAGS) $^ -o $@
@@ -66,7 +64,7 @@ test: \
TestFormat.diff0 \
TestParseDAT.diff \
TestEaster.diff \
- TestParseTime.run \
+# TestParseTime.run \
UseCases.o
clean:
diff --git a/test/TestParseTime.hs b/test/TestParseTime.hs
index 76b897a..b727f3f 100644
--- a/test/TestParseTime.hs
+++ b/test/TestParseTime.hs
@@ -6,7 +6,6 @@ import Data.Ratio
import Data.Time
import Data.Time.Calendar.OrdinalDate
import Data.Time.Calendar.WeekDate
-import Data.Time.Clock
import Data.Time.Clock.POSIX
import System.Locale
import Test.QuickCheck
More information about the ghc-commits
mailing list