[commit: packages/time] master, wip/travis: Changed test case Makefile to work with GHC 6.6 (there is no -package fixed). (eba81c2)

git at git.haskell.org git at git.haskell.org
Sat May 7 06:44:14 UTC 2016


Repository : ssh://git@git.haskell.org/time

On branches: master,wip/travis
Link       : http://git.haskell.org/packages/time.git/commitdiff/eba81c2d010185d361181c3132f6de9165037b43

>---------------------------------------------------------------

commit eba81c2d010185d361181c3132f6de9165037b43
Author: bjorn <bjorn at bringert.net>
Date:   Thu Nov 16 03:13:46 2006 -0800

    Changed test case Makefile to work with GHC 6.6 (there is no -package fixed).
    
    darcs-hash:20061116111346-6cdb2-7ced2b2124315f6bf4545d0617ec10bd50bd6896


>---------------------------------------------------------------

eba81c2d010185d361181c3132f6de9165037b43
 time/test/LongWeekYears.hs |  1 -
 time/test/Makefile         | 32 ++++++++++++++++++--------------
 2 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/time/test/LongWeekYears.hs b/time/test/LongWeekYears.hs
index b5c3913..db453be 100644
--- a/time/test/LongWeekYears.hs
+++ b/time/test/LongWeekYears.hs
@@ -2,7 +2,6 @@
 
 module Main where
 
-import Data.Time.Calendar.OrdinalDate
 import Data.Time.Calendar.WeekDate
 import Data.Time.Calendar
 
diff --git a/time/test/Makefile b/time/test/Makefile
index cb4c2ea..9df2b39 100644
--- a/time/test/Makefile
+++ b/time/test/Makefile
@@ -1,52 +1,55 @@
+GHC = ghc
+GHCFLAGS = 
+
 default: CurrentTime.run ShowDST.run test
 
 TestMonthDay: TestMonthDay.o ../libHStime.a
-	ghc -package fixed $^ -o $@
+	$(GHC) $(GHCFLAGS) $^ -o $@
 
 ConvertBack: ConvertBack.o ../libHStime.a
-	ghc -package fixed $^ -o $@
+	$(GHC) $(GHCFLAGS) $^ -o $@
 
 TestCalendars: TestCalendars.o ../libHStime.a
-	ghc -package fixed $^ -o $@
+	$(GHC) $(GHCFLAGS) $^ -o $@
 
 TestTime: TestTime.o ../libHStime.a
-	ghc -package fixed $^ -o $@
+	$(GHC) $(GHCFLAGS) $^ -o $@
 
 LongWeekYears: LongWeekYears.o ../libHStime.a
-	ghc -package fixed $^ -o $@
+	$(GHC) $(GHCFLAGS) $^ -o $@
 
 ClipDates: ClipDates.o ../libHStime.a
-	ghc -package fixed $^ -o $@
+	$(GHC) $(GHCFLAGS) $^ -o $@
 
 AddDays: AddDays.o ../libHStime.a
-	ghc -package fixed $^ -o $@
+	$(GHC) $(GHCFLAGS) $^ -o $@
 
 TestFormat: TestFormat.o TestFormatStuff.o ../libHStime.a
-	ghc -package fixed $^ -o $@
+	$(GHC) $(GHCFLAGS) $^ -o $@
 
 TestFormatStuff.o: TestFormatStuff.c TestFormatStuff.h
 	gcc -o $@ -c $<
 
 TestParseDAT: TestParseDAT.o ../libHStime.a
-	ghc -package fixed $^ -o $@
+	$(GHC) $(GHCFLAGS) $^ -o $@
 
 TestEaster: TestEaster.o ../libHStime.a
-	ghc -package fixed $^ -o $@
+	$(GHC) $(GHCFLAGS) $^ -o $@
 
 CurrentTime: CurrentTime.o ../libHStime.a
-	ghc -package fixed $^ -o $@
+	$(GHC) $(GHCFLAGS) $^ -o $@
 
 ShowDST: ShowDST.o ../libHStime.a
-	ghc -package fixed $^ -o $@
+	$(GHC) $(GHCFLAGS) $^ -o $@
 
 TimeZone: TimeZone.o ../libHStime.a
-	ghc -package fixed $^ -o $@
+	$(GHC) $(GHCFLAGS) $^ -o $@
 
 TimeZone.ref: FORCE
 	date +%z > $@
 
 TestParseTime: TestParseTime.o ../libHStime.a
-	ghc -package fixed -package QuickCheck $^ -o $@
+	$(GHC) $(GHCFLAGS) -package QuickCheck $^ -o $@
 
 test:	\
 	TestMonthDay.diff	\
@@ -60,6 +63,7 @@ test:	\
 	TestFormat.diff0	\
 	TestParseDAT.diff	\
 	TestEaster.diff	\
+	TestParseTime.run \
 	UseCases.o
 
 clean:



More information about the ghc-commits mailing list