diff --git a/examples/makewith/io/prog/expected b/examples/makewith/io/prog/expected deleted file mode 100644 index 0ca9514..0000000 --- a/examples/makewith/io/prog/expected +++ /dev/null @@ -1 +0,0 @@ -True diff --git a/examples/makewith/unsafeio/prog/expected b/examples/makewith/unsafeio/prog/expected deleted file mode 100644 index 0ca9514..0000000 --- a/examples/makewith/unsafeio/prog/expected +++ /dev/null @@ -1 +0,0 @@ -True diff --git a/examples/README b/testsuite/README similarity index 100% rename from examples/README rename to testsuite/README diff --git a/examples/TIMINGS b/testsuite/TIMINGS similarity index 100% rename from examples/TIMINGS rename to testsuite/TIMINGS diff --git a/examples/build.mk b/testsuite/build.mk similarity index 89% rename from examples/build.mk rename to testsuite/build.mk index 62a0838..677a02f 100644 --- a/examples/build.mk +++ b/testsuite/build.mk @@ -1,7 +1,7 @@ # how to build the default projects include $(TOP)/config.mk -include $(TOP)/examples/check.mk +include $(TOP)/testsuite/check.mk BIN= prog/a.out OBJ= prog/Main.o @@ -12,7 +12,7 @@ REALBIN= ./a.out API_OBJ= api/API.o -INCLUDES= -i$(TOP)/examples/$(TEST)/api +INCLUDES= -i$(TOP)/testsuite/$(TEST)/api GHCFLAGS= -Onot -cpp -fglasgow-exts .SUFFIXES : .o .hs .hi .lhs .hc .s diff --git a/examples/check.mk b/testsuite/check.mk similarity index 100% rename from examples/check.mk rename to testsuite/check.mk diff --git a/examples/conf/simple/Mailrc.conf b/testsuite/conf/simple/Mailrc.conf similarity index 100% rename from examples/conf/simple/Mailrc.conf rename to testsuite/conf/simple/Mailrc.conf diff --git a/examples/conf/simple/Mailrc.stub b/testsuite/conf/simple/Mailrc.stub similarity index 100% rename from examples/conf/simple/Mailrc.stub rename to testsuite/conf/simple/Mailrc.stub diff --git a/examples/conf/simple/Makefile b/testsuite/conf/simple/Makefile similarity index 100% rename from examples/conf/simple/Makefile rename to testsuite/conf/simple/Makefile diff --git a/examples/conf/simple/api/API.hs b/testsuite/conf/simple/api/API.hs similarity index 100% rename from examples/conf/simple/api/API.hs rename to testsuite/conf/simple/api/API.hs diff --git a/examples/conf/simple/prog/Main.hs b/testsuite/conf/simple/prog/Main.hs similarity index 100% rename from examples/conf/simple/prog/Main.hs rename to testsuite/conf/simple/prog/Main.hs diff --git a/examples/conf/simple/prog/expected b/testsuite/conf/simple/prog/expected similarity index 100% rename from examples/conf/simple/prog/expected rename to testsuite/conf/simple/prog/expected diff --git a/examples/dynload/io/Makefile b/testsuite/dynload/io/Makefile similarity index 100% rename from examples/dynload/io/Makefile rename to testsuite/dynload/io/Makefile diff --git a/examples/dynload/io/TestIO.hs b/testsuite/dynload/io/TestIO.hs similarity index 100% rename from examples/dynload/io/TestIO.hs rename to testsuite/dynload/io/TestIO.hs diff --git a/examples/dynload/io/api/API.hs b/testsuite/dynload/io/api/API.hs similarity index 100% rename from examples/dynload/io/api/API.hs rename to testsuite/dynload/io/api/API.hs diff --git a/examples/dynload/io/prog/Main.hs b/testsuite/dynload/io/prog/Main.hs similarity index 100% rename from examples/dynload/io/prog/Main.hs rename to testsuite/dynload/io/prog/Main.hs diff --git a/examples/dynload/io/prog/expected b/testsuite/dynload/io/prog/expected similarity index 100% rename from examples/dynload/io/prog/expected rename to testsuite/dynload/io/prog/expected diff --git a/examples/dynload/poly/Makefile b/testsuite/dynload/poly/Makefile similarity index 100% rename from examples/dynload/poly/Makefile rename to testsuite/dynload/poly/Makefile diff --git a/examples/dynload/poly/Plugin.hs b/testsuite/dynload/poly/Plugin.hs similarity index 100% rename from examples/dynload/poly/Plugin.hs rename to testsuite/dynload/poly/Plugin.hs diff --git a/examples/dynload/poly/api/API.hs b/testsuite/dynload/poly/api/API.hs similarity index 100% rename from examples/dynload/poly/api/API.hs rename to testsuite/dynload/poly/api/API.hs diff --git a/examples/dynload/poly/prog/Main.hs b/testsuite/dynload/poly/prog/Main.hs similarity index 100% rename from examples/dynload/poly/prog/Main.hs rename to testsuite/dynload/poly/prog/Main.hs diff --git a/examples/dynload/poly/prog/expected b/testsuite/dynload/poly/prog/expected similarity index 100% rename from examples/dynload/poly/prog/expected rename to testsuite/dynload/poly/prog/expected diff --git a/examples/dynload/should_fail/Makefile b/testsuite/dynload/should_fail/Makefile similarity index 100% rename from examples/dynload/should_fail/Makefile rename to testsuite/dynload/should_fail/Makefile diff --git a/examples/dynload/should_fail/Plugin.hs b/testsuite/dynload/should_fail/Plugin.hs similarity index 100% rename from examples/dynload/should_fail/Plugin.hs rename to testsuite/dynload/should_fail/Plugin.hs diff --git a/examples/dynload/should_fail/api/API.hs b/testsuite/dynload/should_fail/api/API.hs similarity index 100% rename from examples/dynload/should_fail/api/API.hs rename to testsuite/dynload/should_fail/api/API.hs diff --git a/examples/dynload/should_fail/prog/Main.hs b/testsuite/dynload/should_fail/prog/Main.hs similarity index 100% rename from examples/dynload/should_fail/prog/Main.hs rename to testsuite/dynload/should_fail/prog/Main.hs diff --git a/examples/dynload/should_fail/prog/expected b/testsuite/dynload/should_fail/prog/expected similarity index 100% rename from examples/dynload/should_fail/prog/expected rename to testsuite/dynload/should_fail/prog/expected diff --git a/examples/dynload/should_fail_1/Makefile b/testsuite/dynload/should_fail_1/Makefile similarity index 100% rename from examples/dynload/should_fail_1/Makefile rename to testsuite/dynload/should_fail_1/Makefile diff --git a/examples/dynload/should_fail_1/Plugin.hs b/testsuite/dynload/should_fail_1/Plugin.hs similarity index 100% rename from examples/dynload/should_fail_1/Plugin.hs rename to testsuite/dynload/should_fail_1/Plugin.hs diff --git a/examples/dynload/should_fail_1/api/API.hs b/testsuite/dynload/should_fail_1/api/API.hs similarity index 100% rename from examples/dynload/should_fail_1/api/API.hs rename to testsuite/dynload/should_fail_1/api/API.hs diff --git a/examples/dynload/should_fail_1/prog/Main.hs b/testsuite/dynload/should_fail_1/prog/Main.hs similarity index 100% rename from examples/dynload/should_fail_1/prog/Main.hs rename to testsuite/dynload/should_fail_1/prog/Main.hs diff --git a/examples/dynload/should_fail_1/prog/expected b/testsuite/dynload/should_fail_1/prog/expected similarity index 100% rename from examples/dynload/should_fail_1/prog/expected rename to testsuite/dynload/should_fail_1/prog/expected diff --git a/examples/dynload/should_fail_2/Makefile b/testsuite/dynload/should_fail_2/Makefile similarity index 100% rename from examples/dynload/should_fail_2/Makefile rename to testsuite/dynload/should_fail_2/Makefile diff --git a/examples/dynload/should_fail_2/Plugin.in b/testsuite/dynload/should_fail_2/Plugin.in similarity index 100% rename from examples/dynload/should_fail_2/Plugin.in rename to testsuite/dynload/should_fail_2/Plugin.in diff --git a/examples/dynload/should_fail_2/Plugin.stub b/testsuite/dynload/should_fail_2/Plugin.stub similarity index 100% rename from examples/dynload/should_fail_2/Plugin.stub rename to testsuite/dynload/should_fail_2/Plugin.stub diff --git a/examples/dynload/should_fail_2/api/API.hs b/testsuite/dynload/should_fail_2/api/API.hs similarity index 100% rename from examples/dynload/should_fail_2/api/API.hs rename to testsuite/dynload/should_fail_2/api/API.hs diff --git a/examples/dynload/should_fail_2/prog/Main.hs b/testsuite/dynload/should_fail_2/prog/Main.hs similarity index 100% rename from examples/dynload/should_fail_2/prog/Main.hs rename to testsuite/dynload/should_fail_2/prog/Main.hs diff --git a/examples/dynload/should_fail_2/prog/expected b/testsuite/dynload/should_fail_2/prog/expected similarity index 100% rename from examples/dynload/should_fail_2/prog/expected rename to testsuite/dynload/should_fail_2/prog/expected diff --git a/examples/dynload/should_fail_2/prog/expected.604 b/testsuite/dynload/should_fail_2/prog/expected.604 similarity index 100% rename from examples/dynload/should_fail_2/prog/expected.604 rename to testsuite/dynload/should_fail_2/prog/expected.604 diff --git a/examples/dynload/should_fail_2/prog/expected.605 b/testsuite/dynload/should_fail_2/prog/expected.605 similarity index 100% rename from examples/dynload/should_fail_2/prog/expected.605 rename to testsuite/dynload/should_fail_2/prog/expected.605 diff --git a/examples/dynload/should_fail_3/Makefile b/testsuite/dynload/should_fail_3/Makefile similarity index 100% rename from examples/dynload/should_fail_3/Makefile rename to testsuite/dynload/should_fail_3/Makefile diff --git a/examples/dynload/should_fail_3/Plugin.in b/testsuite/dynload/should_fail_3/Plugin.in similarity index 100% rename from examples/dynload/should_fail_3/Plugin.in rename to testsuite/dynload/should_fail_3/Plugin.in diff --git a/examples/dynload/should_fail_3/Plugin.stub b/testsuite/dynload/should_fail_3/Plugin.stub similarity index 100% rename from examples/dynload/should_fail_3/Plugin.stub rename to testsuite/dynload/should_fail_3/Plugin.stub diff --git a/examples/dynload/should_fail_3/api/API.hs b/testsuite/dynload/should_fail_3/api/API.hs similarity index 100% rename from examples/dynload/should_fail_3/api/API.hs rename to testsuite/dynload/should_fail_3/api/API.hs diff --git a/examples/dynload/should_fail_3/prog/Main.hs b/testsuite/dynload/should_fail_3/prog/Main.hs similarity index 100% rename from examples/dynload/should_fail_3/prog/Main.hs rename to testsuite/dynload/should_fail_3/prog/Main.hs diff --git a/examples/dynload/should_fail_3/prog/expected b/testsuite/dynload/should_fail_3/prog/expected similarity index 100% rename from examples/dynload/should_fail_3/prog/expected rename to testsuite/dynload/should_fail_3/prog/expected diff --git a/examples/dynload/should_fail_3/prog/expected.604 b/testsuite/dynload/should_fail_3/prog/expected.604 similarity index 100% rename from examples/dynload/should_fail_3/prog/expected.604 rename to testsuite/dynload/should_fail_3/prog/expected.604 diff --git a/examples/dynload/should_fail_3/prog/expected.605 b/testsuite/dynload/should_fail_3/prog/expected.605 similarity index 100% rename from examples/dynload/should_fail_3/prog/expected.605 rename to testsuite/dynload/should_fail_3/prog/expected.605 diff --git a/examples/dynload/simple/Makefile b/testsuite/dynload/simple/Makefile similarity index 100% rename from examples/dynload/simple/Makefile rename to testsuite/dynload/simple/Makefile diff --git a/examples/dynload/simple/Plugin.hs b/testsuite/dynload/simple/Plugin.hs similarity index 100% rename from examples/dynload/simple/Plugin.hs rename to testsuite/dynload/simple/Plugin.hs diff --git a/examples/dynload/simple/api/API.hs b/testsuite/dynload/simple/api/API.hs similarity index 100% rename from examples/dynload/simple/api/API.hs rename to testsuite/dynload/simple/api/API.hs diff --git a/examples/dynload/simple/prog/Main.hs b/testsuite/dynload/simple/prog/Main.hs similarity index 100% rename from examples/dynload/simple/prog/Main.hs rename to testsuite/dynload/simple/prog/Main.hs diff --git a/examples/dynload/simple/prog/expected b/testsuite/dynload/simple/prog/expected similarity index 100% rename from examples/dynload/simple/prog/expected rename to testsuite/dynload/simple/prog/expected diff --git a/examples/eval.mk b/testsuite/eval.mk similarity index 91% rename from examples/eval.mk rename to testsuite/eval.mk index 4553193..f12d33f 100644 --- a/examples/eval.mk +++ b/testsuite/eval.mk @@ -1,5 +1,5 @@ include $(TOP)/config.mk -include $(TOP)/examples/check.mk +include $(TOP)/testsuite/check.mk BIN=a.out SRC=Main.hs diff --git a/examples/eval/eval1/Main.hs b/testsuite/eval/eval1/Main.hs similarity index 100% rename from examples/eval/eval1/Main.hs rename to testsuite/eval/eval1/Main.hs diff --git a/examples/eval/eval1/Makefile b/testsuite/eval/eval1/Makefile similarity index 100% rename from examples/eval/eval1/Makefile rename to testsuite/eval/eval1/Makefile diff --git a/examples/eval/eval1/expected b/testsuite/eval/eval1/expected similarity index 100% rename from examples/eval/eval1/expected rename to testsuite/eval/eval1/expected diff --git a/examples/eval/eval2/Main.hs b/testsuite/eval/eval2/Main.hs similarity index 100% rename from examples/eval/eval2/Main.hs rename to testsuite/eval/eval2/Main.hs diff --git a/examples/eval/eval2/Makefile b/testsuite/eval/eval2/Makefile similarity index 100% rename from examples/eval/eval2/Makefile rename to testsuite/eval/eval2/Makefile diff --git a/examples/eval/eval2/expected b/testsuite/eval/eval2/expected similarity index 100% rename from examples/eval/eval2/expected rename to testsuite/eval/eval2/expected diff --git a/examples/eval/eval3/Main.hs b/testsuite/eval/eval3/Main.hs similarity index 93% rename from examples/eval/eval3/Main.hs rename to testsuite/eval/eval3/Main.hs index 68e4a0e..0bbf757 100644 --- a/examples/eval/eval3/Main.hs +++ b/testsuite/eval/eval3/Main.hs @@ -4,7 +4,7 @@ -- -- Not so bad to use AltData, as it is already derived for all the basic -- types. Then, just replace deriving Typeable, with hand-derived --- instance of Typeable (see hs-plugins/examples/eval/eval_fn1/Poly.hs +-- instance of Typeable (see hs-plugins/testsuite/eval/eval_fn1/Poly.hs -- -- diff --git a/examples/eval/eval3/Makefile b/testsuite/eval/eval3/Makefile similarity index 100% rename from examples/eval/eval3/Makefile rename to testsuite/eval/eval3/Makefile diff --git a/examples/eval/eval3/expected b/testsuite/eval/eval3/expected similarity index 100% rename from examples/eval/eval3/expected rename to testsuite/eval/eval3/expected diff --git a/examples/eval/eval_/Main.hs b/testsuite/eval/eval_/Main.hs similarity index 100% rename from examples/eval/eval_/Main.hs rename to testsuite/eval/eval_/Main.hs diff --git a/examples/eval/eval_/Makefile b/testsuite/eval/eval_/Makefile similarity index 100% rename from examples/eval/eval_/Makefile rename to testsuite/eval/eval_/Makefile diff --git a/examples/eval/eval_/expected b/testsuite/eval/eval_/expected similarity index 100% rename from examples/eval/eval_/expected rename to testsuite/eval/eval_/expected diff --git a/examples/eval/eval_fn/Main.hs b/testsuite/eval/eval_fn/Main.hs similarity index 100% rename from examples/eval/eval_fn/Main.hs rename to testsuite/eval/eval_fn/Main.hs diff --git a/examples/eval/eval_fn/Makefile b/testsuite/eval/eval_fn/Makefile similarity index 100% rename from examples/eval/eval_fn/Makefile rename to testsuite/eval/eval_fn/Makefile diff --git a/examples/eval/eval_fn/expected b/testsuite/eval/eval_fn/expected similarity index 100% rename from examples/eval/eval_fn/expected rename to testsuite/eval/eval_fn/expected diff --git a/examples/eval/eval_fn1/Main.hs b/testsuite/eval/eval_fn1/Main.hs similarity index 100% rename from examples/eval/eval_fn1/Main.hs rename to testsuite/eval/eval_fn1/Main.hs diff --git a/examples/eval/eval_fn1/Makefile b/testsuite/eval/eval_fn1/Makefile similarity index 100% rename from examples/eval/eval_fn1/Makefile rename to testsuite/eval/eval_fn1/Makefile diff --git a/examples/eval/eval_fn1/Poly.hs b/testsuite/eval/eval_fn1/Poly.hs similarity index 100% rename from examples/eval/eval_fn1/Poly.hs rename to testsuite/eval/eval_fn1/Poly.hs diff --git a/examples/eval/eval_fn1/expected b/testsuite/eval/eval_fn1/expected similarity index 100% rename from examples/eval/eval_fn1/expected rename to testsuite/eval/eval_fn1/expected diff --git a/examples/eval/foreign_eval/Makefile b/testsuite/eval/foreign_eval/Makefile similarity index 100% rename from examples/eval/foreign_eval/Makefile rename to testsuite/eval/foreign_eval/Makefile diff --git a/examples/eval/foreign_eval/README b/testsuite/eval/foreign_eval/README similarity index 100% rename from examples/eval/foreign_eval/README rename to testsuite/eval/foreign_eval/README diff --git a/examples/objc/expression_parser/dont_test b/testsuite/eval/foreign_eval/dont_test similarity index 100% rename from examples/objc/expression_parser/dont_test rename to testsuite/eval/foreign_eval/dont_test diff --git a/examples/eval/foreign_eval/expected b/testsuite/eval/foreign_eval/expected similarity index 100% rename from examples/eval/foreign_eval/expected rename to testsuite/eval/foreign_eval/expected diff --git a/examples/eval/foreign_eval/main.c b/testsuite/eval/foreign_eval/main.c similarity index 100% rename from examples/eval/foreign_eval/main.c rename to testsuite/eval/foreign_eval/main.c diff --git a/examples/eval/foreign_eval1/Makefile b/testsuite/eval/foreign_eval1/Makefile similarity index 100% rename from examples/eval/foreign_eval1/Makefile rename to testsuite/eval/foreign_eval1/Makefile diff --git a/examples/pdynload/spj1/dont_test b/testsuite/eval/foreign_eval1/dont_test similarity index 100% rename from examples/pdynload/spj1/dont_test rename to testsuite/eval/foreign_eval1/dont_test diff --git a/examples/eval/foreign_eval1/expected b/testsuite/eval/foreign_eval1/expected similarity index 100% rename from examples/eval/foreign_eval1/expected rename to testsuite/eval/foreign_eval1/expected diff --git a/examples/eval/foreign_eval1/main.c b/testsuite/eval/foreign_eval1/main.c similarity index 100% rename from examples/eval/foreign_eval1/main.c rename to testsuite/eval/foreign_eval1/main.c diff --git a/examples/eval/foreign_should_fail/Makefile b/testsuite/eval/foreign_should_fail/Makefile similarity index 100% rename from examples/eval/foreign_should_fail/Makefile rename to testsuite/eval/foreign_should_fail/Makefile diff --git a/examples/pkgconf/null/dont_test b/testsuite/eval/foreign_should_fail/dont_test similarity index 100% rename from examples/pkgconf/null/dont_test rename to testsuite/eval/foreign_should_fail/dont_test diff --git a/examples/eval/foreign_should_fail/expected b/testsuite/eval/foreign_should_fail/expected similarity index 100% rename from examples/eval/foreign_should_fail/expected rename to testsuite/eval/foreign_should_fail/expected diff --git a/examples/eval/foreign_should_fail/expected.604 b/testsuite/eval/foreign_should_fail/expected.604 similarity index 100% rename from examples/eval/foreign_should_fail/expected.604 rename to testsuite/eval/foreign_should_fail/expected.604 diff --git a/examples/eval/foreign_should_fail/expected.605 b/testsuite/eval/foreign_should_fail/expected.605 similarity index 100% rename from examples/eval/foreign_should_fail/expected.605 rename to testsuite/eval/foreign_should_fail/expected.605 diff --git a/examples/eval/foreign_should_fail/main.c b/testsuite/eval/foreign_should_fail/main.c similarity index 100% rename from examples/eval/foreign_should_fail/main.c rename to testsuite/eval/foreign_should_fail/main.c diff --git a/examples/eval/foreign_should_fail_illtyped/Makefile b/testsuite/eval/foreign_should_fail_illtyped/Makefile similarity index 100% rename from examples/eval/foreign_should_fail_illtyped/Makefile rename to testsuite/eval/foreign_should_fail_illtyped/Makefile diff --git a/examples/shell/shell/dont_test b/testsuite/eval/foreign_should_fail_illtyped/dont_test similarity index 100% rename from examples/shell/shell/dont_test rename to testsuite/eval/foreign_should_fail_illtyped/dont_test diff --git a/examples/eval/foreign_should_fail_illtyped/expected b/testsuite/eval/foreign_should_fail_illtyped/expected similarity index 100% rename from examples/eval/foreign_should_fail_illtyped/expected rename to testsuite/eval/foreign_should_fail_illtyped/expected diff --git a/examples/eval/foreign_should_fail_illtyped/expected.604 b/testsuite/eval/foreign_should_fail_illtyped/expected.604 similarity index 100% rename from examples/eval/foreign_should_fail_illtyped/expected.604 rename to testsuite/eval/foreign_should_fail_illtyped/expected.604 diff --git a/examples/eval/foreign_should_fail_illtyped/expected.605 b/testsuite/eval/foreign_should_fail_illtyped/expected.605 similarity index 100% rename from examples/eval/foreign_should_fail_illtyped/expected.605 rename to testsuite/eval/foreign_should_fail_illtyped/expected.605 diff --git a/examples/eval/foreign_should_fail_illtyped/main.c b/testsuite/eval/foreign_should_fail_illtyped/main.c similarity index 100% rename from examples/eval/foreign_should_fail_illtyped/main.c rename to testsuite/eval/foreign_should_fail_illtyped/main.c diff --git a/examples/eval/unsafeidir/Main.hs b/testsuite/eval/unsafeidir/Main.hs similarity index 100% rename from examples/eval/unsafeidir/Main.hs rename to testsuite/eval/unsafeidir/Main.hs diff --git a/examples/eval/unsafeidir/Makefile b/testsuite/eval/unsafeidir/Makefile similarity index 100% rename from examples/eval/unsafeidir/Makefile rename to testsuite/eval/unsafeidir/Makefile diff --git a/examples/eval/unsafeidir/a/Extra.hs b/testsuite/eval/unsafeidir/a/Extra.hs similarity index 100% rename from examples/eval/unsafeidir/a/Extra.hs rename to testsuite/eval/unsafeidir/a/Extra.hs diff --git a/examples/eval/unsafeidir/expected b/testsuite/eval/unsafeidir/expected similarity index 100% rename from examples/eval/unsafeidir/expected rename to testsuite/eval/unsafeidir/expected diff --git a/examples/foreign.mk b/testsuite/foreign.mk similarity index 91% rename from examples/foreign.mk rename to testsuite/foreign.mk index a502c12..03fdebc 100644 --- a/examples/foreign.mk +++ b/testsuite/foreign.mk @@ -1,5 +1,5 @@ include $(TOP)/config.mk -include $(TOP)/examples/check.mk +include $(TOP)/testsuite/check.mk INCLUDES= -I$(TOP) diff --git a/examples/hier/hier1/Makefile b/testsuite/hier/hier1/Makefile similarity index 100% rename from examples/hier/hier1/Makefile rename to testsuite/hier/hier1/Makefile diff --git a/examples/hier/hier1/Modules/Flags.hs b/testsuite/hier/hier1/Modules/Flags.hs similarity index 100% rename from examples/hier/hier1/Modules/Flags.hs rename to testsuite/hier/hier1/Modules/Flags.hs diff --git a/examples/hier/hier1/Modules/Makefile b/testsuite/hier/hier1/Modules/Makefile similarity index 100% rename from examples/hier/hier1/Modules/Makefile rename to testsuite/hier/hier1/Modules/Makefile diff --git a/examples/hier/hier1/Plugin.hs b/testsuite/hier/hier1/Plugin.hs similarity index 100% rename from examples/hier/hier1/Plugin.hs rename to testsuite/hier/hier1/Plugin.hs diff --git a/examples/hier/hier1/api/API.hs b/testsuite/hier/hier1/api/API.hs similarity index 100% rename from examples/hier/hier1/api/API.hs rename to testsuite/hier/hier1/api/API.hs diff --git a/examples/hier/hier1/prog/Main.hs b/testsuite/hier/hier1/prog/Main.hs similarity index 100% rename from examples/hier/hier1/prog/Main.hs rename to testsuite/hier/hier1/prog/Main.hs diff --git a/examples/hier/hier1/prog/expected b/testsuite/hier/hier1/prog/expected similarity index 100% rename from examples/hier/hier1/prog/expected rename to testsuite/hier/hier1/prog/expected diff --git a/examples/hier/hier2/A/B/C/Module.hs b/testsuite/hier/hier2/A/B/C/Module.hs similarity index 100% rename from examples/hier/hier2/A/B/C/Module.hs rename to testsuite/hier/hier2/A/B/C/Module.hs diff --git a/examples/hier/hier2/A/Makefile b/testsuite/hier/hier2/A/Makefile similarity index 100% rename from examples/hier/hier2/A/Makefile rename to testsuite/hier/hier2/A/Makefile diff --git a/examples/hier/hier2/Makefile b/testsuite/hier/hier2/Makefile similarity index 100% rename from examples/hier/hier2/Makefile rename to testsuite/hier/hier2/Makefile diff --git a/examples/hier/hier2/api/API.hs b/testsuite/hier/hier2/api/API.hs similarity index 100% rename from examples/hier/hier2/api/API.hs rename to testsuite/hier/hier2/api/API.hs diff --git a/examples/hier/hier2/prog/Main.hs b/testsuite/hier/hier2/prog/Main.hs similarity index 100% rename from examples/hier/hier2/prog/Main.hs rename to testsuite/hier/hier2/prog/Main.hs diff --git a/examples/hier/hier2/prog/expected b/testsuite/hier/hier2/prog/expected similarity index 100% rename from examples/hier/hier2/prog/expected rename to testsuite/hier/hier2/prog/expected diff --git a/examples/hier/hier3/Main.hs b/testsuite/hier/hier3/Main.hs similarity index 100% rename from examples/hier/hier3/Main.hs rename to testsuite/hier/hier3/Main.hs diff --git a/examples/hier/hier3/Makefile b/testsuite/hier/hier3/Makefile similarity index 100% rename from examples/hier/hier3/Makefile rename to testsuite/hier/hier3/Makefile diff --git a/examples/hier/hier3/One.hs b/testsuite/hier/hier3/One.hs similarity index 100% rename from examples/hier/hier3/One.hs rename to testsuite/hier/hier3/One.hs diff --git a/examples/hier/hier3/Two.hs b/testsuite/hier/hier3/Two.hs similarity index 100% rename from examples/hier/hier3/Two.hs rename to testsuite/hier/hier3/Two.hs diff --git a/examples/hier/hier3/expected b/testsuite/hier/hier3/expected similarity index 100% rename from examples/hier/hier3/expected rename to testsuite/hier/hier3/expected diff --git a/examples/hier/hier4/A.hs b/testsuite/hier/hier4/A.hs similarity index 100% rename from examples/hier/hier4/A.hs rename to testsuite/hier/hier4/A.hs diff --git a/examples/hier/hier4/B.hs b/testsuite/hier/hier4/B.hs similarity index 100% rename from examples/hier/hier4/B.hs rename to testsuite/hier/hier4/B.hs diff --git a/examples/hier/hier4/C.hs b/testsuite/hier/hier4/C.hs similarity index 100% rename from examples/hier/hier4/C.hs rename to testsuite/hier/hier4/C.hs diff --git a/examples/hier/hier4/D.hs b/testsuite/hier/hier4/D.hs similarity index 100% rename from examples/hier/hier4/D.hs rename to testsuite/hier/hier4/D.hs diff --git a/examples/hier/hier4/Main.hs b/testsuite/hier/hier4/Main.hs similarity index 100% rename from examples/hier/hier4/Main.hs rename to testsuite/hier/hier4/Main.hs diff --git a/examples/hier/hier4/Makefile b/testsuite/hier/hier4/Makefile similarity index 100% rename from examples/hier/hier4/Makefile rename to testsuite/hier/hier4/Makefile diff --git a/examples/hier/hier4/expected b/testsuite/hier/hier4/expected similarity index 100% rename from examples/hier/hier4/expected rename to testsuite/hier/hier4/expected diff --git a/examples/iface/null/A.hs b/testsuite/iface/null/A.hs similarity index 100% rename from examples/iface/null/A.hs rename to testsuite/iface/null/A.hs diff --git a/examples/iface/null/B.hs b/testsuite/iface/null/B.hs similarity index 100% rename from examples/iface/null/B.hs rename to testsuite/iface/null/B.hs diff --git a/examples/iface/null/Main.hs b/testsuite/iface/null/Main.hs similarity index 100% rename from examples/iface/null/Main.hs rename to testsuite/iface/null/Main.hs diff --git a/examples/iface/null/Makefile b/testsuite/iface/null/Makefile similarity index 100% rename from examples/iface/null/Makefile rename to testsuite/iface/null/Makefile diff --git a/examples/iface/null/expected b/testsuite/iface/null/expected similarity index 100% rename from examples/iface/null/expected rename to testsuite/iface/null/expected diff --git a/examples/iface/null/expected.604 b/testsuite/iface/null/expected.604 similarity index 100% rename from examples/iface/null/expected.604 rename to testsuite/iface/null/expected.604 diff --git a/examples/iface/null/expected.605 b/testsuite/iface/null/expected.605 similarity index 100% rename from examples/iface/null/expected.605 rename to testsuite/iface/null/expected.605 diff --git a/examples/load/io/Makefile b/testsuite/load/io/Makefile similarity index 100% rename from examples/load/io/Makefile rename to testsuite/load/io/Makefile diff --git a/examples/load/io/TestIO.hs b/testsuite/load/io/TestIO.hs similarity index 100% rename from examples/load/io/TestIO.hs rename to testsuite/load/io/TestIO.hs diff --git a/examples/load/io/api/API.hs b/testsuite/load/io/api/API.hs similarity index 100% rename from examples/load/io/api/API.hs rename to testsuite/load/io/api/API.hs diff --git a/examples/load/io/prog/Main.hs b/testsuite/load/io/prog/Main.hs similarity index 100% rename from examples/load/io/prog/Main.hs rename to testsuite/load/io/prog/Main.hs diff --git a/examples/load/io/prog/expected b/testsuite/load/io/prog/expected similarity index 100% rename from examples/load/io/prog/expected rename to testsuite/load/io/prog/expected diff --git a/examples/load/load_0/Makefile b/testsuite/load/load_0/Makefile similarity index 100% rename from examples/load/load_0/Makefile rename to testsuite/load/load_0/Makefile diff --git a/examples/load/load_0/Test.hs b/testsuite/load/load_0/Test.hs similarity index 100% rename from examples/load/load_0/Test.hs rename to testsuite/load/load_0/Test.hs diff --git a/examples/load/load_0/api/API.hs b/testsuite/load/load_0/api/API.hs similarity index 100% rename from examples/load/load_0/api/API.hs rename to testsuite/load/load_0/api/API.hs diff --git a/examples/load/load_0/prog/Main.hs b/testsuite/load/load_0/prog/Main.hs similarity index 100% rename from examples/load/load_0/prog/Main.hs rename to testsuite/load/load_0/prog/Main.hs diff --git a/examples/load/load_0/prog/expected b/testsuite/load/load_0/prog/expected similarity index 100% rename from examples/load/load_0/prog/expected rename to testsuite/load/load_0/prog/expected diff --git a/examples/load/loadpkg/Main.hs b/testsuite/load/loadpkg/Main.hs similarity index 100% rename from examples/load/loadpkg/Main.hs rename to testsuite/load/loadpkg/Main.hs diff --git a/examples/load/loadpkg/Makefile b/testsuite/load/loadpkg/Makefile similarity index 100% rename from examples/load/loadpkg/Makefile rename to testsuite/load/loadpkg/Makefile diff --git a/examples/load/loadpkg/expected b/testsuite/load/loadpkg/expected similarity index 100% rename from examples/load/loadpkg/expected rename to testsuite/load/loadpkg/expected diff --git a/examples/load/null/Makefile b/testsuite/load/null/Makefile similarity index 100% rename from examples/load/null/Makefile rename to testsuite/load/null/Makefile diff --git a/examples/load/null/Null.hs b/testsuite/load/null/Null.hs similarity index 100% rename from examples/load/null/Null.hs rename to testsuite/load/null/Null.hs diff --git a/examples/load/null/api/API.hs b/testsuite/load/null/api/API.hs similarity index 100% rename from examples/load/null/api/API.hs rename to testsuite/load/null/api/API.hs diff --git a/examples/load/null/prog/Main.hs b/testsuite/load/null/prog/Main.hs similarity index 86% rename from examples/load/null/prog/Main.hs rename to testsuite/load/null/prog/Main.hs index fdad4a0..217a21e 100644 --- a/examples/load/null/prog/Main.hs +++ b/testsuite/load/null/prog/Main.hs @@ -8,7 +8,7 @@ import API -- an example where we just want to load an object and run it main = do - let includes = [TOP ++ "/examples/load/null/api"] + let includes = [TOP ++ "/testsuite/load/null/api"] m_v <- load "../Null.o" includes [] "resource" v <- case m_v of LoadSuccess _ v -> return v diff --git a/examples/load/null/prog/expected b/testsuite/load/null/prog/expected similarity index 100% rename from examples/load/null/prog/expected rename to testsuite/load/null/prog/expected diff --git a/examples/load/thiemann0/Makefile b/testsuite/load/thiemann0/Makefile similarity index 100% rename from examples/load/thiemann0/Makefile rename to testsuite/load/thiemann0/Makefile diff --git a/examples/load/thiemann0/Test.hs b/testsuite/load/thiemann0/Test.hs similarity index 100% rename from examples/load/thiemann0/Test.hs rename to testsuite/load/thiemann0/Test.hs diff --git a/examples/load/thiemann0/api/API.hs b/testsuite/load/thiemann0/api/API.hs similarity index 100% rename from examples/load/thiemann0/api/API.hs rename to testsuite/load/thiemann0/api/API.hs diff --git a/examples/load/thiemann0/prog/Main.hs b/testsuite/load/thiemann0/prog/Main.hs similarity index 100% rename from examples/load/thiemann0/prog/Main.hs rename to testsuite/load/thiemann0/prog/Main.hs diff --git a/examples/load/thiemann0/prog/expected b/testsuite/load/thiemann0/prog/expected similarity index 100% rename from examples/load/thiemann0/prog/expected rename to testsuite/load/thiemann0/prog/expected diff --git a/examples/load/thiemann2/C.hs b/testsuite/load/thiemann2/C.hs similarity index 100% rename from examples/load/thiemann2/C.hs rename to testsuite/load/thiemann2/C.hs diff --git a/examples/load/thiemann2/Makefile b/testsuite/load/thiemann2/Makefile similarity index 100% rename from examples/load/thiemann2/Makefile rename to testsuite/load/thiemann2/Makefile diff --git a/examples/load/thiemann2/api/API.hs b/testsuite/load/thiemann2/api/API.hs similarity index 100% rename from examples/load/thiemann2/api/API.hs rename to testsuite/load/thiemann2/api/API.hs diff --git a/examples/load/thiemann2/prog/A.hs b/testsuite/load/thiemann2/prog/A.hs similarity index 100% rename from examples/load/thiemann2/prog/A.hs rename to testsuite/load/thiemann2/prog/A.hs diff --git a/examples/load/thiemann2/prog/B.hs b/testsuite/load/thiemann2/prog/B.hs similarity index 100% rename from examples/load/thiemann2/prog/B.hs rename to testsuite/load/thiemann2/prog/B.hs diff --git a/examples/load/thiemann2/prog/Main.hs b/testsuite/load/thiemann2/prog/Main.hs similarity index 100% rename from examples/load/thiemann2/prog/Main.hs rename to testsuite/load/thiemann2/prog/Main.hs diff --git a/examples/load/thiemann2/prog/expected b/testsuite/load/thiemann2/prog/expected similarity index 100% rename from examples/load/thiemann2/prog/expected rename to testsuite/load/thiemann2/prog/expected diff --git a/examples/load/unloadpkg/Main.hs b/testsuite/load/unloadpkg/Main.hs similarity index 100% rename from examples/load/unloadpkg/Main.hs rename to testsuite/load/unloadpkg/Main.hs diff --git a/examples/load/unloadpkg/Makefile b/testsuite/load/unloadpkg/Makefile similarity index 100% rename from examples/load/unloadpkg/Makefile rename to testsuite/load/unloadpkg/Makefile diff --git a/examples/load/unloadpkg/expected b/testsuite/load/unloadpkg/expected similarity index 100% rename from examples/load/unloadpkg/expected rename to testsuite/load/unloadpkg/expected diff --git a/examples/loadCLib/null/Makefile b/testsuite/loadCLib/null/Makefile similarity index 100% rename from examples/loadCLib/null/Makefile rename to testsuite/loadCLib/null/Makefile diff --git a/examples/loadCLib/null/Null.hs b/testsuite/loadCLib/null/Null.hs similarity index 100% rename from examples/loadCLib/null/Null.hs rename to testsuite/loadCLib/null/Null.hs diff --git a/examples/loadCLib/null/api/API.hs b/testsuite/loadCLib/null/api/API.hs similarity index 100% rename from examples/loadCLib/null/api/API.hs rename to testsuite/loadCLib/null/api/API.hs diff --git a/examples/loadCLib/null/prog/Main.hs b/testsuite/loadCLib/null/prog/Main.hs similarity index 100% rename from examples/loadCLib/null/prog/Main.hs rename to testsuite/loadCLib/null/prog/Main.hs diff --git a/examples/loadCLib/null/prog/expected b/testsuite/loadCLib/null/prog/expected similarity index 100% rename from examples/loadCLib/null/prog/expected rename to testsuite/loadCLib/null/prog/expected diff --git a/examples/make/makeall001/A.hs b/testsuite/make/makeall001/A.hs similarity index 100% rename from examples/make/makeall001/A.hs rename to testsuite/make/makeall001/A.hs diff --git a/examples/make/makeall001/B.hs b/testsuite/make/makeall001/B.hs similarity index 100% rename from examples/make/makeall001/B.hs rename to testsuite/make/makeall001/B.hs diff --git a/examples/make/makeall001/C.hs b/testsuite/make/makeall001/C.hs similarity index 100% rename from examples/make/makeall001/C.hs rename to testsuite/make/makeall001/C.hs diff --git a/examples/make/makeall001/Makefile b/testsuite/make/makeall001/Makefile similarity index 100% rename from examples/make/makeall001/Makefile rename to testsuite/make/makeall001/Makefile diff --git a/examples/make/makeall001/Tiny.hs b/testsuite/make/makeall001/Tiny.hs similarity index 100% rename from examples/make/makeall001/Tiny.hs rename to testsuite/make/makeall001/Tiny.hs diff --git a/examples/make/makeall001/api/API.hs b/testsuite/make/makeall001/api/API.hs similarity index 100% rename from examples/make/makeall001/api/API.hs rename to testsuite/make/makeall001/api/API.hs diff --git a/examples/make/makeall001/prog/Main.hs b/testsuite/make/makeall001/prog/Main.hs similarity index 100% rename from examples/make/makeall001/prog/Main.hs rename to testsuite/make/makeall001/prog/Main.hs diff --git a/examples/make/makeall001/prog/expected b/testsuite/make/makeall001/prog/expected similarity index 100% rename from examples/make/makeall001/prog/expected rename to testsuite/make/makeall001/prog/expected diff --git a/examples/make/null/Makefile b/testsuite/make/null/Makefile similarity index 100% rename from examples/make/null/Makefile rename to testsuite/make/null/Makefile diff --git a/examples/make/null/Null.hs b/testsuite/make/null/Null.hs similarity index 100% rename from examples/make/null/Null.hs rename to testsuite/make/null/Null.hs diff --git a/examples/make/null/api/API.hs b/testsuite/make/null/api/API.hs similarity index 100% rename from examples/make/null/api/API.hs rename to testsuite/make/null/api/API.hs diff --git a/examples/make/null/prog/Main.hs b/testsuite/make/null/prog/Main.hs similarity index 100% rename from examples/make/null/prog/Main.hs rename to testsuite/make/null/prog/Main.hs diff --git a/examples/make/null/prog/expected b/testsuite/make/null/prog/expected similarity index 100% rename from examples/make/null/prog/expected rename to testsuite/make/null/prog/expected diff --git a/examples/make/o/Makefile b/testsuite/make/o/Makefile similarity index 100% rename from examples/make/o/Makefile rename to testsuite/make/o/Makefile diff --git a/examples/make/o/Plugin.hs b/testsuite/make/o/Plugin.hs similarity index 100% rename from examples/make/o/Plugin.hs rename to testsuite/make/o/Plugin.hs diff --git a/examples/make/o/api/API.hs b/testsuite/make/o/api/API.hs similarity index 100% rename from examples/make/o/api/API.hs rename to testsuite/make/o/api/API.hs diff --git a/examples/make/o/prog/Main.hs b/testsuite/make/o/prog/Main.hs similarity index 100% rename from examples/make/o/prog/Main.hs rename to testsuite/make/o/prog/Main.hs diff --git a/examples/make/o/prog/expected b/testsuite/make/o/prog/expected similarity index 100% rename from examples/make/o/prog/expected rename to testsuite/make/o/prog/expected diff --git a/examples/make/odir/Makefile b/testsuite/make/odir/Makefile similarity index 100% rename from examples/make/odir/Makefile rename to testsuite/make/odir/Makefile diff --git a/examples/make/odir/Plugin.hs b/testsuite/make/odir/Plugin.hs similarity index 100% rename from examples/make/odir/Plugin.hs rename to testsuite/make/odir/Plugin.hs diff --git a/examples/make/odir/api/API.hs b/testsuite/make/odir/api/API.hs similarity index 100% rename from examples/make/odir/api/API.hs rename to testsuite/make/odir/api/API.hs diff --git a/examples/make/odir/prog/Main.hs b/testsuite/make/odir/prog/Main.hs similarity index 100% rename from examples/make/odir/prog/Main.hs rename to testsuite/make/odir/prog/Main.hs diff --git a/examples/make/odir/prog/expected b/testsuite/make/odir/prog/expected similarity index 100% rename from examples/make/odir/prog/expected rename to testsuite/make/odir/prog/expected diff --git a/examples/make/remake001/Bar.hs b/testsuite/make/remake001/Bar.hs similarity index 100% rename from examples/make/remake001/Bar.hs rename to testsuite/make/remake001/Bar.hs diff --git a/examples/make/remake001/Foo.hs b/testsuite/make/remake001/Foo.hs similarity index 100% rename from examples/make/remake001/Foo.hs rename to testsuite/make/remake001/Foo.hs diff --git a/examples/make/remake001/Main.hs b/testsuite/make/remake001/Main.hs similarity index 100% rename from examples/make/remake001/Main.hs rename to testsuite/make/remake001/Main.hs diff --git a/examples/make/remake001/Makefile b/testsuite/make/remake001/Makefile similarity index 100% rename from examples/make/remake001/Makefile rename to testsuite/make/remake001/Makefile diff --git a/examples/make/remake001/expected b/testsuite/make/remake001/expected similarity index 100% rename from examples/make/remake001/expected rename to testsuite/make/remake001/expected diff --git a/examples/make/remake001_should_fail/Bar.hs b/testsuite/make/remake001_should_fail/Bar.hs similarity index 100% rename from examples/make/remake001_should_fail/Bar.hs rename to testsuite/make/remake001_should_fail/Bar.hs diff --git a/examples/make/remake001_should_fail/Foo.hs b/testsuite/make/remake001_should_fail/Foo.hs similarity index 100% rename from examples/make/remake001_should_fail/Foo.hs rename to testsuite/make/remake001_should_fail/Foo.hs diff --git a/examples/make/remake001_should_fail/Main.hs b/testsuite/make/remake001_should_fail/Main.hs similarity index 100% rename from examples/make/remake001_should_fail/Main.hs rename to testsuite/make/remake001_should_fail/Main.hs diff --git a/examples/make/remake001_should_fail/Makefile b/testsuite/make/remake001_should_fail/Makefile similarity index 100% rename from examples/make/remake001_should_fail/Makefile rename to testsuite/make/remake001_should_fail/Makefile diff --git a/examples/make/remake001_should_fail/expected b/testsuite/make/remake001_should_fail/expected similarity index 100% rename from examples/make/remake001_should_fail/expected rename to testsuite/make/remake001_should_fail/expected diff --git a/examples/make/simple/Makefile b/testsuite/make/simple/Makefile similarity index 100% rename from examples/make/simple/Makefile rename to testsuite/make/simple/Makefile diff --git a/examples/make/simple/Tiny.hs b/testsuite/make/simple/Tiny.hs similarity index 100% rename from examples/make/simple/Tiny.hs rename to testsuite/make/simple/Tiny.hs diff --git a/examples/make/simple/api/API.hs b/testsuite/make/simple/api/API.hs similarity index 100% rename from examples/make/simple/api/API.hs rename to testsuite/make/simple/api/API.hs diff --git a/examples/make/simple/prog/Main.hs b/testsuite/make/simple/prog/Main.hs similarity index 100% rename from examples/make/simple/prog/Main.hs rename to testsuite/make/simple/prog/Main.hs diff --git a/examples/make/simple/prog/expected b/testsuite/make/simple/prog/expected similarity index 100% rename from examples/make/simple/prog/expected rename to testsuite/make/simple/prog/expected diff --git a/examples/makewith/global_pragma/Makefile b/testsuite/makewith/global_pragma/Makefile similarity index 100% rename from examples/makewith/global_pragma/Makefile rename to testsuite/makewith/global_pragma/Makefile diff --git a/examples/makewith/global_pragma/Plugin.hs b/testsuite/makewith/global_pragma/Plugin.hs similarity index 100% rename from examples/makewith/global_pragma/Plugin.hs rename to testsuite/makewith/global_pragma/Plugin.hs diff --git a/examples/makewith/global_pragma/api/API.hs b/testsuite/makewith/global_pragma/api/API.hs similarity index 100% rename from examples/makewith/global_pragma/api/API.hs rename to testsuite/makewith/global_pragma/api/API.hs diff --git a/examples/makewith/global_pragma/prog/Main.hs b/testsuite/makewith/global_pragma/prog/Main.hs similarity index 100% rename from examples/makewith/global_pragma/prog/Main.hs rename to testsuite/makewith/global_pragma/prog/Main.hs diff --git a/examples/makewith/global_pragma/prog/expected b/testsuite/makewith/global_pragma/prog/expected similarity index 100% rename from examples/makewith/global_pragma/prog/expected rename to testsuite/makewith/global_pragma/prog/expected diff --git a/examples/makewith/io/Makefile b/testsuite/makewith/io/Makefile similarity index 100% rename from examples/makewith/io/Makefile rename to testsuite/makewith/io/Makefile diff --git a/examples/makewith/io/README b/testsuite/makewith/io/README similarity index 100% rename from examples/makewith/io/README rename to testsuite/makewith/io/README diff --git a/examples/makewith/io/TestIO.conf.in b/testsuite/makewith/io/TestIO.conf.in similarity index 100% rename from examples/makewith/io/TestIO.conf.in rename to testsuite/makewith/io/TestIO.conf.in diff --git a/examples/makewith/io/TestIO.stub b/testsuite/makewith/io/TestIO.stub similarity index 100% rename from examples/makewith/io/TestIO.stub rename to testsuite/makewith/io/TestIO.stub diff --git a/examples/makewith/io/api/API.hs b/testsuite/makewith/io/api/API.hs similarity index 100% rename from examples/makewith/io/api/API.hs rename to testsuite/makewith/io/api/API.hs diff --git a/examples/makewith/io/prog/Main.hs b/testsuite/makewith/io/prog/Main.hs similarity index 100% rename from examples/makewith/io/prog/Main.hs rename to testsuite/makewith/io/prog/Main.hs diff --git a/testsuite/makewith/io/prog/expected b/testsuite/makewith/io/prog/expected new file mode 100644 index 0000000..b7d5354 --- /dev/null +++ b/testsuite/makewith/io/prog/expected @@ -0,0 +1,6 @@ +merge failed: + +parse error in ../TestIO.conf +line: 17, col: 1 + +a.out: failed diff --git a/examples/makewith/merge00/Bar.hs b/testsuite/makewith/merge00/Bar.hs similarity index 100% rename from examples/makewith/merge00/Bar.hs rename to testsuite/makewith/merge00/Bar.hs diff --git a/examples/makewith/merge00/Foo.hs b/testsuite/makewith/merge00/Foo.hs similarity index 100% rename from examples/makewith/merge00/Foo.hs rename to testsuite/makewith/merge00/Foo.hs diff --git a/examples/makewith/merge00/Main.hs b/testsuite/makewith/merge00/Main.hs similarity index 100% rename from examples/makewith/merge00/Main.hs rename to testsuite/makewith/merge00/Main.hs diff --git a/examples/makewith/merge00/Makefile b/testsuite/makewith/merge00/Makefile similarity index 100% rename from examples/makewith/merge00/Makefile rename to testsuite/makewith/merge00/Makefile diff --git a/examples/makewith/merge00/expected b/testsuite/makewith/merge00/expected similarity index 100% rename from examples/makewith/merge00/expected rename to testsuite/makewith/merge00/expected diff --git a/examples/makewith/mergeto0/Bar.hs b/testsuite/makewith/mergeto0/Bar.hs similarity index 100% rename from examples/makewith/mergeto0/Bar.hs rename to testsuite/makewith/mergeto0/Bar.hs diff --git a/examples/makewith/mergeto0/Foo.hs b/testsuite/makewith/mergeto0/Foo.hs similarity index 100% rename from examples/makewith/mergeto0/Foo.hs rename to testsuite/makewith/mergeto0/Foo.hs diff --git a/examples/makewith/mergeto0/Main.hs b/testsuite/makewith/mergeto0/Main.hs similarity index 100% rename from examples/makewith/mergeto0/Main.hs rename to testsuite/makewith/mergeto0/Main.hs diff --git a/examples/makewith/mergeto0/Makefile b/testsuite/makewith/mergeto0/Makefile similarity index 100% rename from examples/makewith/mergeto0/Makefile rename to testsuite/makewith/mergeto0/Makefile diff --git a/examples/makewith/mergeto0/expected b/testsuite/makewith/mergeto0/expected similarity index 100% rename from examples/makewith/mergeto0/expected rename to testsuite/makewith/mergeto0/expected diff --git a/examples/makewith/module_name/Bar.hs b/testsuite/makewith/module_name/Bar.hs similarity index 100% rename from examples/makewith/module_name/Bar.hs rename to testsuite/makewith/module_name/Bar.hs diff --git a/examples/makewith/module_name/Foo.hs b/testsuite/makewith/module_name/Foo.hs similarity index 100% rename from examples/makewith/module_name/Foo.hs rename to testsuite/makewith/module_name/Foo.hs diff --git a/examples/makewith/module_name/Main.hs b/testsuite/makewith/module_name/Main.hs similarity index 100% rename from examples/makewith/module_name/Main.hs rename to testsuite/makewith/module_name/Main.hs diff --git a/examples/makewith/module_name/Makefile b/testsuite/makewith/module_name/Makefile similarity index 100% rename from examples/makewith/module_name/Makefile rename to testsuite/makewith/module_name/Makefile diff --git a/examples/makewith/module_name/expected b/testsuite/makewith/module_name/expected similarity index 100% rename from examples/makewith/module_name/expected rename to testsuite/makewith/module_name/expected diff --git a/examples/makewith/multi_make/Bar.hs b/testsuite/makewith/multi_make/Bar.hs similarity index 100% rename from examples/makewith/multi_make/Bar.hs rename to testsuite/makewith/multi_make/Bar.hs diff --git a/examples/makewith/multi_make/Foo.hs b/testsuite/makewith/multi_make/Foo.hs similarity index 100% rename from examples/makewith/multi_make/Foo.hs rename to testsuite/makewith/multi_make/Foo.hs diff --git a/examples/makewith/multi_make/Main.hs b/testsuite/makewith/multi_make/Main.hs similarity index 100% rename from examples/makewith/multi_make/Main.hs rename to testsuite/makewith/multi_make/Main.hs diff --git a/examples/makewith/multi_make/Makefile b/testsuite/makewith/multi_make/Makefile similarity index 100% rename from examples/makewith/multi_make/Makefile rename to testsuite/makewith/multi_make/Makefile diff --git a/examples/makewith/multi_make/Stub.hs b/testsuite/makewith/multi_make/Stub.hs similarity index 100% rename from examples/makewith/multi_make/Stub.hs rename to testsuite/makewith/multi_make/Stub.hs diff --git a/examples/makewith/multi_make/expected b/testsuite/makewith/multi_make/expected similarity index 100% rename from examples/makewith/multi_make/expected rename to testsuite/makewith/multi_make/expected diff --git a/examples/makewith/should_fail_0/Makefile b/testsuite/makewith/should_fail_0/Makefile similarity index 100% rename from examples/makewith/should_fail_0/Makefile rename to testsuite/makewith/should_fail_0/Makefile diff --git a/examples/makewith/should_fail_0/Plugin.in b/testsuite/makewith/should_fail_0/Plugin.in similarity index 100% rename from examples/makewith/should_fail_0/Plugin.in rename to testsuite/makewith/should_fail_0/Plugin.in diff --git a/examples/makewith/should_fail_0/Plugin.stub b/testsuite/makewith/should_fail_0/Plugin.stub similarity index 100% rename from examples/makewith/should_fail_0/Plugin.stub rename to testsuite/makewith/should_fail_0/Plugin.stub diff --git a/examples/makewith/should_fail_0/api/API.hs b/testsuite/makewith/should_fail_0/api/API.hs similarity index 100% rename from examples/makewith/should_fail_0/api/API.hs rename to testsuite/makewith/should_fail_0/api/API.hs diff --git a/examples/makewith/should_fail_0/prog/Main.hs b/testsuite/makewith/should_fail_0/prog/Main.hs similarity index 100% rename from examples/makewith/should_fail_0/prog/Main.hs rename to testsuite/makewith/should_fail_0/prog/Main.hs diff --git a/examples/makewith/should_fail_0/prog/expected b/testsuite/makewith/should_fail_0/prog/expected similarity index 100% rename from examples/makewith/should_fail_0/prog/expected rename to testsuite/makewith/should_fail_0/prog/expected diff --git a/examples/makewith/tiny/Makefile b/testsuite/makewith/tiny/Makefile similarity index 100% rename from examples/makewith/tiny/Makefile rename to testsuite/makewith/tiny/Makefile diff --git a/examples/makewith/tiny/Tiny.conf b/testsuite/makewith/tiny/Tiny.conf similarity index 100% rename from examples/makewith/tiny/Tiny.conf rename to testsuite/makewith/tiny/Tiny.conf diff --git a/examples/makewith/tiny/Tiny.stub b/testsuite/makewith/tiny/Tiny.stub similarity index 100% rename from examples/makewith/tiny/Tiny.stub rename to testsuite/makewith/tiny/Tiny.stub diff --git a/examples/makewith/tiny/api/API.hs b/testsuite/makewith/tiny/api/API.hs similarity index 100% rename from examples/makewith/tiny/api/API.hs rename to testsuite/makewith/tiny/api/API.hs diff --git a/examples/makewith/tiny/prog/Main.hs b/testsuite/makewith/tiny/prog/Main.hs similarity index 100% rename from examples/makewith/tiny/prog/Main.hs rename to testsuite/makewith/tiny/prog/Main.hs diff --git a/examples/makewith/tiny/prog/expected b/testsuite/makewith/tiny/prog/expected similarity index 100% rename from examples/makewith/tiny/prog/expected rename to testsuite/makewith/tiny/prog/expected diff --git a/examples/makewith/unsafeio/Makefile b/testsuite/makewith/unsafeio/Makefile similarity index 100% rename from examples/makewith/unsafeio/Makefile rename to testsuite/makewith/unsafeio/Makefile diff --git a/examples/makewith/unsafeio/README b/testsuite/makewith/unsafeio/README similarity index 100% rename from examples/makewith/unsafeio/README rename to testsuite/makewith/unsafeio/README diff --git a/examples/makewith/unsafeio/Unsafe.conf.in b/testsuite/makewith/unsafeio/Unsafe.conf.in similarity index 100% rename from examples/makewith/unsafeio/Unsafe.conf.in rename to testsuite/makewith/unsafeio/Unsafe.conf.in diff --git a/examples/makewith/unsafeio/Unsafe.stub b/testsuite/makewith/unsafeio/Unsafe.stub similarity index 100% rename from examples/makewith/unsafeio/Unsafe.stub rename to testsuite/makewith/unsafeio/Unsafe.stub diff --git a/examples/makewith/unsafeio/api/API.hs b/testsuite/makewith/unsafeio/api/API.hs similarity index 100% rename from examples/makewith/unsafeio/api/API.hs rename to testsuite/makewith/unsafeio/api/API.hs diff --git a/examples/makewith/unsafeio/prog/Main.hs b/testsuite/makewith/unsafeio/prog/Main.hs similarity index 100% rename from examples/makewith/unsafeio/prog/Main.hs rename to testsuite/makewith/unsafeio/prog/Main.hs diff --git a/examples/makewith/unsafeio/prog/README b/testsuite/makewith/unsafeio/prog/README similarity index 100% rename from examples/makewith/unsafeio/prog/README rename to testsuite/makewith/unsafeio/prog/README diff --git a/testsuite/makewith/unsafeio/prog/expected b/testsuite/makewith/unsafeio/prog/expected new file mode 100644 index 0000000..bcb60f4 --- /dev/null +++ b/testsuite/makewith/unsafeio/prog/expected @@ -0,0 +1,6 @@ +merge failed: + +parse error in ../Unsafe.conf +line: 13, col: 1 + +a.out: failed diff --git a/examples/misc/mkstemps/Main.hs b/testsuite/misc/mkstemps/Main.hs similarity index 100% rename from examples/misc/mkstemps/Main.hs rename to testsuite/misc/mkstemps/Main.hs diff --git a/examples/misc/mkstemps/Makefile b/testsuite/misc/mkstemps/Makefile similarity index 100% rename from examples/misc/mkstemps/Makefile rename to testsuite/misc/mkstemps/Makefile diff --git a/examples/misc/mkstemps/expected b/testsuite/misc/mkstemps/expected similarity index 100% rename from examples/misc/mkstemps/expected rename to testsuite/misc/mkstemps/expected diff --git a/examples/multi/3plugins/Makefile b/testsuite/multi/3plugins/Makefile similarity index 100% rename from examples/multi/3plugins/Makefile rename to testsuite/multi/3plugins/Makefile diff --git a/examples/multi/3plugins/Plugin1.hs b/testsuite/multi/3plugins/Plugin1.hs similarity index 100% rename from examples/multi/3plugins/Plugin1.hs rename to testsuite/multi/3plugins/Plugin1.hs diff --git a/examples/multi/3plugins/Plugin2.hs b/testsuite/multi/3plugins/Plugin2.hs similarity index 100% rename from examples/multi/3plugins/Plugin2.hs rename to testsuite/multi/3plugins/Plugin2.hs diff --git a/examples/multi/3plugins/Plugin3.hs b/testsuite/multi/3plugins/Plugin3.hs similarity index 100% rename from examples/multi/3plugins/Plugin3.hs rename to testsuite/multi/3plugins/Plugin3.hs diff --git a/examples/multi/3plugins/api/API.hs b/testsuite/multi/3plugins/api/API.hs similarity index 100% rename from examples/multi/3plugins/api/API.hs rename to testsuite/multi/3plugins/api/API.hs diff --git a/examples/multi/3plugins/prog/Main.hs b/testsuite/multi/3plugins/prog/Main.hs similarity index 100% rename from examples/multi/3plugins/prog/Main.hs rename to testsuite/multi/3plugins/prog/Main.hs diff --git a/examples/multi/3plugins/prog/expected b/testsuite/multi/3plugins/prog/expected similarity index 100% rename from examples/multi/3plugins/prog/expected rename to testsuite/multi/3plugins/prog/expected diff --git a/examples/objc/expression_parser/ArithmeticExpressionParser.hs b/testsuite/objc/expression_parser/ArithmeticExpressionParser.hs similarity index 100% rename from examples/objc/expression_parser/ArithmeticExpressionParser.hs rename to testsuite/objc/expression_parser/ArithmeticExpressionParser.hs diff --git a/examples/objc/expression_parser/English.lproj/Credits.rtf b/testsuite/objc/expression_parser/English.lproj/Credits.rtf similarity index 100% rename from examples/objc/expression_parser/English.lproj/Credits.rtf rename to testsuite/objc/expression_parser/English.lproj/Credits.rtf diff --git a/examples/objc/expression_parser/English.lproj/InfoPlist.strings b/testsuite/objc/expression_parser/English.lproj/InfoPlist.strings similarity index 100% rename from examples/objc/expression_parser/English.lproj/InfoPlist.strings rename to testsuite/objc/expression_parser/English.lproj/InfoPlist.strings diff --git a/examples/objc/expression_parser/English.lproj/MainMenu.nib/classes.nib b/testsuite/objc/expression_parser/English.lproj/MainMenu.nib/classes.nib similarity index 100% rename from examples/objc/expression_parser/English.lproj/MainMenu.nib/classes.nib rename to testsuite/objc/expression_parser/English.lproj/MainMenu.nib/classes.nib diff --git a/examples/objc/expression_parser/English.lproj/MainMenu.nib/info.nib b/testsuite/objc/expression_parser/English.lproj/MainMenu.nib/info.nib similarity index 100% rename from examples/objc/expression_parser/English.lproj/MainMenu.nib/info.nib rename to testsuite/objc/expression_parser/English.lproj/MainMenu.nib/info.nib diff --git a/examples/objc/expression_parser/English.lproj/MainMenu.nib/objects.nib b/testsuite/objc/expression_parser/English.lproj/MainMenu.nib/objects.nib similarity index 100% rename from examples/objc/expression_parser/English.lproj/MainMenu.nib/objects.nib rename to testsuite/objc/expression_parser/English.lproj/MainMenu.nib/objects.nib diff --git a/examples/objc/expression_parser/English.lproj/MyDocument.nib/classes.nib b/testsuite/objc/expression_parser/English.lproj/MyDocument.nib/classes.nib similarity index 100% rename from examples/objc/expression_parser/English.lproj/MyDocument.nib/classes.nib rename to testsuite/objc/expression_parser/English.lproj/MyDocument.nib/classes.nib diff --git a/examples/objc/expression_parser/English.lproj/MyDocument.nib/info.nib b/testsuite/objc/expression_parser/English.lproj/MyDocument.nib/info.nib similarity index 100% rename from examples/objc/expression_parser/English.lproj/MyDocument.nib/info.nib rename to testsuite/objc/expression_parser/English.lproj/MyDocument.nib/info.nib diff --git a/examples/objc/expression_parser/English.lproj/MyDocument.nib/keyedobjects.nib b/testsuite/objc/expression_parser/English.lproj/MyDocument.nib/keyedobjects.nib similarity index 100% rename from examples/objc/expression_parser/English.lproj/MyDocument.nib/keyedobjects.nib rename to testsuite/objc/expression_parser/English.lproj/MyDocument.nib/keyedobjects.nib diff --git a/examples/objc/expression_parser/English.lproj/MyDocument.nib/objects.nib b/testsuite/objc/expression_parser/English.lproj/MyDocument.nib/objects.nib similarity index 100% rename from examples/objc/expression_parser/English.lproj/MyDocument.nib/objects.nib rename to testsuite/objc/expression_parser/English.lproj/MyDocument.nib/objects.nib diff --git a/examples/objc/expression_parser/Info.plist b/testsuite/objc/expression_parser/Info.plist similarity index 100% rename from examples/objc/expression_parser/Info.plist rename to testsuite/objc/expression_parser/Info.plist diff --git a/examples/objc/expression_parser/KeyValueParser.hs b/testsuite/objc/expression_parser/KeyValueParser.hs similarity index 100% rename from examples/objc/expression_parser/KeyValueParser.hs rename to testsuite/objc/expression_parser/KeyValueParser.hs diff --git a/examples/objc/expression_parser/Makefile b/testsuite/objc/expression_parser/Makefile similarity index 100% rename from examples/objc/expression_parser/Makefile rename to testsuite/objc/expression_parser/Makefile diff --git a/examples/objc/expression_parser/MyDocument.h b/testsuite/objc/expression_parser/MyDocument.h similarity index 100% rename from examples/objc/expression_parser/MyDocument.h rename to testsuite/objc/expression_parser/MyDocument.h diff --git a/examples/objc/expression_parser/MyDocument.m b/testsuite/objc/expression_parser/MyDocument.m similarity index 100% rename from examples/objc/expression_parser/MyDocument.m rename to testsuite/objc/expression_parser/MyDocument.m diff --git a/examples/objc/expression_parser/PluginEvalAux.hs b/testsuite/objc/expression_parser/PluginEvalAux.hs similarity index 100% rename from examples/objc/expression_parser/PluginEvalAux.hs rename to testsuite/objc/expression_parser/PluginEvalAux.hs diff --git a/examples/objc/expression_parser/PluginExpressionParser.xcode/project.pbxproj b/testsuite/objc/expression_parser/PluginExpressionParser.xcode/project.pbxproj similarity index 100% rename from examples/objc/expression_parser/PluginExpressionParser.xcode/project.pbxproj rename to testsuite/objc/expression_parser/PluginExpressionParser.xcode/project.pbxproj diff --git a/examples/objc/expression_parser/PluginExpressionParser_Prefix.pch b/testsuite/objc/expression_parser/PluginExpressionParser_Prefix.pch similarity index 100% rename from examples/objc/expression_parser/PluginExpressionParser_Prefix.pch rename to testsuite/objc/expression_parser/PluginExpressionParser_Prefix.pch diff --git a/examples/objc/expression_parser/README b/testsuite/objc/expression_parser/README similarity index 100% rename from examples/objc/expression_parser/README rename to testsuite/objc/expression_parser/README diff --git a/examples/objc/expression_parser/RunHaskell.h b/testsuite/objc/expression_parser/RunHaskell.h similarity index 100% rename from examples/objc/expression_parser/RunHaskell.h rename to testsuite/objc/expression_parser/RunHaskell.h diff --git a/examples/shell/simple/dont_test b/testsuite/objc/expression_parser/dont_test similarity index 100% rename from examples/shell/simple/dont_test rename to testsuite/objc/expression_parser/dont_test diff --git a/examples/objc/expression_parser/main.m b/testsuite/objc/expression_parser/main.m similarity index 100% rename from examples/objc/expression_parser/main.m rename to testsuite/objc/expression_parser/main.m diff --git a/examples/objc/expression_parser/version.plist b/testsuite/objc/expression_parser/version.plist similarity index 100% rename from examples/objc/expression_parser/version.plist rename to testsuite/objc/expression_parser/version.plist diff --git a/examples/pdynload/badint/Makefile b/testsuite/pdynload/badint/Makefile similarity index 100% rename from examples/pdynload/badint/Makefile rename to testsuite/pdynload/badint/Makefile diff --git a/examples/pdynload/badint/Plugin.hs b/testsuite/pdynload/badint/Plugin.hs similarity index 100% rename from examples/pdynload/badint/Plugin.hs rename to testsuite/pdynload/badint/Plugin.hs diff --git a/examples/pdynload/badint/api/API.hs b/testsuite/pdynload/badint/api/API.hs similarity index 100% rename from examples/pdynload/badint/api/API.hs rename to testsuite/pdynload/badint/api/API.hs diff --git a/examples/pdynload/badint/prog/Main.hs b/testsuite/pdynload/badint/prog/Main.hs similarity index 100% rename from examples/pdynload/badint/prog/Main.hs rename to testsuite/pdynload/badint/prog/Main.hs diff --git a/examples/pdynload/badint/prog/expected b/testsuite/pdynload/badint/prog/expected similarity index 100% rename from examples/pdynload/badint/prog/expected rename to testsuite/pdynload/badint/prog/expected diff --git a/examples/pdynload/bayley1/Load.hs b/testsuite/pdynload/bayley1/Load.hs similarity index 100% rename from examples/pdynload/bayley1/Load.hs rename to testsuite/pdynload/bayley1/Load.hs diff --git a/examples/pdynload/bayley1/Makefile b/testsuite/pdynload/bayley1/Makefile similarity index 100% rename from examples/pdynload/bayley1/Makefile rename to testsuite/pdynload/bayley1/Makefile diff --git a/examples/pdynload/bayley1/Plugin1.hs b/testsuite/pdynload/bayley1/Plugin1.hs similarity index 100% rename from examples/pdynload/bayley1/Plugin1.hs rename to testsuite/pdynload/bayley1/Plugin1.hs diff --git a/examples/pdynload/bayley1/Sub/Plugin2.hs b/testsuite/pdynload/bayley1/Sub/Plugin2.hs similarity index 100% rename from examples/pdynload/bayley1/Sub/Plugin2.hs rename to testsuite/pdynload/bayley1/Sub/Plugin2.hs diff --git a/examples/pdynload/bayley1/api/API.hs b/testsuite/pdynload/bayley1/api/API.hs similarity index 100% rename from examples/pdynload/bayley1/api/API.hs rename to testsuite/pdynload/bayley1/api/API.hs diff --git a/examples/pdynload/bayley1/prog/Main.hs b/testsuite/pdynload/bayley1/prog/Main.hs similarity index 100% rename from examples/pdynload/bayley1/prog/Main.hs rename to testsuite/pdynload/bayley1/prog/Main.hs diff --git a/examples/pdynload/null/Makefile b/testsuite/pdynload/null/Makefile similarity index 100% rename from examples/pdynload/null/Makefile rename to testsuite/pdynload/null/Makefile diff --git a/examples/pdynload/null/Plugin.hs b/testsuite/pdynload/null/Plugin.hs similarity index 100% rename from examples/pdynload/null/Plugin.hs rename to testsuite/pdynload/null/Plugin.hs diff --git a/examples/pdynload/null/api/API.hs b/testsuite/pdynload/null/api/API.hs similarity index 100% rename from examples/pdynload/null/api/API.hs rename to testsuite/pdynload/null/api/API.hs diff --git a/examples/pdynload/null/prog/Main.hs b/testsuite/pdynload/null/prog/Main.hs similarity index 100% rename from examples/pdynload/null/prog/Main.hs rename to testsuite/pdynload/null/prog/Main.hs diff --git a/examples/pdynload/null/prog/expected b/testsuite/pdynload/null/prog/expected similarity index 100% rename from examples/pdynload/null/prog/expected rename to testsuite/pdynload/null/prog/expected diff --git a/examples/pdynload/numclass/Makefile b/testsuite/pdynload/numclass/Makefile similarity index 100% rename from examples/pdynload/numclass/Makefile rename to testsuite/pdynload/numclass/Makefile diff --git a/examples/pdynload/numclass/Plugin.hs b/testsuite/pdynload/numclass/Plugin.hs similarity index 100% rename from examples/pdynload/numclass/Plugin.hs rename to testsuite/pdynload/numclass/Plugin.hs diff --git a/examples/pdynload/numclass/api/API.hs b/testsuite/pdynload/numclass/api/API.hs similarity index 100% rename from examples/pdynload/numclass/api/API.hs rename to testsuite/pdynload/numclass/api/API.hs diff --git a/examples/pdynload/numclass/prog/Main.hs b/testsuite/pdynload/numclass/prog/Main.hs similarity index 100% rename from examples/pdynload/numclass/prog/Main.hs rename to testsuite/pdynload/numclass/prog/Main.hs diff --git a/examples/pdynload/numclass/prog/expected b/testsuite/pdynload/numclass/prog/expected similarity index 100% rename from examples/pdynload/numclass/prog/expected rename to testsuite/pdynload/numclass/prog/expected diff --git a/examples/pdynload/poly/Makefile b/testsuite/pdynload/poly/Makefile similarity index 100% rename from examples/pdynload/poly/Makefile rename to testsuite/pdynload/poly/Makefile diff --git a/examples/pdynload/poly/Plugin.hs b/testsuite/pdynload/poly/Plugin.hs similarity index 100% rename from examples/pdynload/poly/Plugin.hs rename to testsuite/pdynload/poly/Plugin.hs diff --git a/examples/pdynload/poly/api/API.hs b/testsuite/pdynload/poly/api/API.hs similarity index 100% rename from examples/pdynload/poly/api/API.hs rename to testsuite/pdynload/poly/api/API.hs diff --git a/examples/pdynload/poly/prog/Main.hs b/testsuite/pdynload/poly/prog/Main.hs similarity index 100% rename from examples/pdynload/poly/prog/Main.hs rename to testsuite/pdynload/poly/prog/Main.hs diff --git a/examples/pdynload/poly/prog/expected b/testsuite/pdynload/poly/prog/expected similarity index 100% rename from examples/pdynload/poly/prog/expected rename to testsuite/pdynload/poly/prog/expected diff --git a/examples/pdynload/poly1/Makefile b/testsuite/pdynload/poly1/Makefile similarity index 100% rename from examples/pdynload/poly1/Makefile rename to testsuite/pdynload/poly1/Makefile diff --git a/examples/pdynload/poly1/Plugin.hs b/testsuite/pdynload/poly1/Plugin.hs similarity index 100% rename from examples/pdynload/poly1/Plugin.hs rename to testsuite/pdynload/poly1/Plugin.hs diff --git a/examples/pdynload/poly1/api/API.hs b/testsuite/pdynload/poly1/api/API.hs similarity index 100% rename from examples/pdynload/poly1/api/API.hs rename to testsuite/pdynload/poly1/api/API.hs diff --git a/examples/pdynload/poly1/prog/Main.hs b/testsuite/pdynload/poly1/prog/Main.hs similarity index 100% rename from examples/pdynload/poly1/prog/Main.hs rename to testsuite/pdynload/poly1/prog/Main.hs diff --git a/examples/pdynload/poly1/prog/expected b/testsuite/pdynload/poly1/prog/expected similarity index 100% rename from examples/pdynload/poly1/prog/expected rename to testsuite/pdynload/poly1/prog/expected diff --git a/examples/pdynload/should_fail0/Makefile b/testsuite/pdynload/should_fail0/Makefile similarity index 100% rename from examples/pdynload/should_fail0/Makefile rename to testsuite/pdynload/should_fail0/Makefile diff --git a/examples/pdynload/should_fail0/Plugin.hs b/testsuite/pdynload/should_fail0/Plugin.hs similarity index 100% rename from examples/pdynload/should_fail0/Plugin.hs rename to testsuite/pdynload/should_fail0/Plugin.hs diff --git a/examples/pdynload/should_fail0/api/API.hs b/testsuite/pdynload/should_fail0/api/API.hs similarity index 100% rename from examples/pdynload/should_fail0/api/API.hs rename to testsuite/pdynload/should_fail0/api/API.hs diff --git a/examples/pdynload/should_fail0/prog/Main.hs b/testsuite/pdynload/should_fail0/prog/Main.hs similarity index 100% rename from examples/pdynload/should_fail0/prog/Main.hs rename to testsuite/pdynload/should_fail0/prog/Main.hs diff --git a/examples/pdynload/should_fail0/prog/expected b/testsuite/pdynload/should_fail0/prog/expected similarity index 100% rename from examples/pdynload/should_fail0/prog/expected rename to testsuite/pdynload/should_fail0/prog/expected diff --git a/examples/pdynload/should_fail1/Makefile b/testsuite/pdynload/should_fail1/Makefile similarity index 100% rename from examples/pdynload/should_fail1/Makefile rename to testsuite/pdynload/should_fail1/Makefile diff --git a/examples/pdynload/should_fail1/Plugin.hs b/testsuite/pdynload/should_fail1/Plugin.hs similarity index 100% rename from examples/pdynload/should_fail1/Plugin.hs rename to testsuite/pdynload/should_fail1/Plugin.hs diff --git a/examples/pdynload/should_fail1/api/API.hs b/testsuite/pdynload/should_fail1/api/API.hs similarity index 100% rename from examples/pdynload/should_fail1/api/API.hs rename to testsuite/pdynload/should_fail1/api/API.hs diff --git a/examples/pdynload/should_fail1/prog/Main.hs b/testsuite/pdynload/should_fail1/prog/Main.hs similarity index 100% rename from examples/pdynload/should_fail1/prog/Main.hs rename to testsuite/pdynload/should_fail1/prog/Main.hs diff --git a/examples/pdynload/should_fail1/prog/expected b/testsuite/pdynload/should_fail1/prog/expected similarity index 100% rename from examples/pdynload/should_fail1/prog/expected rename to testsuite/pdynload/should_fail1/prog/expected diff --git a/examples/pdynload/small/Makefile b/testsuite/pdynload/small/Makefile similarity index 100% rename from examples/pdynload/small/Makefile rename to testsuite/pdynload/small/Makefile diff --git a/examples/pdynload/small/Plugin.hs b/testsuite/pdynload/small/Plugin.hs similarity index 100% rename from examples/pdynload/small/Plugin.hs rename to testsuite/pdynload/small/Plugin.hs diff --git a/examples/pdynload/small/api/API.hs b/testsuite/pdynload/small/api/API.hs similarity index 100% rename from examples/pdynload/small/api/API.hs rename to testsuite/pdynload/small/api/API.hs diff --git a/examples/pdynload/small/prog/Main.hs b/testsuite/pdynload/small/prog/Main.hs similarity index 100% rename from examples/pdynload/small/prog/Main.hs rename to testsuite/pdynload/small/prog/Main.hs diff --git a/examples/pdynload/small/prog/expected b/testsuite/pdynload/small/prog/expected similarity index 100% rename from examples/pdynload/small/prog/expected rename to testsuite/pdynload/small/prog/expected diff --git a/examples/pdynload/spj1/Makefile b/testsuite/pdynload/spj1/Makefile similarity index 100% rename from examples/pdynload/spj1/Makefile rename to testsuite/pdynload/spj1/Makefile diff --git a/examples/pdynload/spj1/Plugin.hs b/testsuite/pdynload/spj1/Plugin.hs similarity index 100% rename from examples/pdynload/spj1/Plugin.hs rename to testsuite/pdynload/spj1/Plugin.hs diff --git a/examples/pdynload/spj1/api/API.hs b/testsuite/pdynload/spj1/api/API.hs similarity index 100% rename from examples/pdynload/spj1/api/API.hs rename to testsuite/pdynload/spj1/api/API.hs diff --git a/examples/pdynload/spj1/prog/expected b/testsuite/pdynload/spj1/dont_test similarity index 100% rename from examples/pdynload/spj1/prog/expected rename to testsuite/pdynload/spj1/dont_test diff --git a/examples/pdynload/spj1/prog/Main.hs b/testsuite/pdynload/spj1/prog/Main.hs similarity index 100% rename from examples/pdynload/spj1/prog/Main.hs rename to testsuite/pdynload/spj1/prog/Main.hs diff --git a/testsuite/pdynload/spj1/prog/expected b/testsuite/pdynload/spj1/prog/expected new file mode 100644 index 0000000..e69de29 diff --git a/examples/pdynload/spj2/Makefile b/testsuite/pdynload/spj2/Makefile similarity index 100% rename from examples/pdynload/spj2/Makefile rename to testsuite/pdynload/spj2/Makefile diff --git a/examples/pdynload/spj2/Plugin.hs b/testsuite/pdynload/spj2/Plugin.hs similarity index 100% rename from examples/pdynload/spj2/Plugin.hs rename to testsuite/pdynload/spj2/Plugin.hs diff --git a/examples/pdynload/spj2/api/API.hs b/testsuite/pdynload/spj2/api/API.hs similarity index 100% rename from examples/pdynload/spj2/api/API.hs rename to testsuite/pdynload/spj2/api/API.hs diff --git a/examples/pdynload/spj2/prog/Main.hs b/testsuite/pdynload/spj2/prog/Main.hs similarity index 100% rename from examples/pdynload/spj2/prog/Main.hs rename to testsuite/pdynload/spj2/prog/Main.hs diff --git a/examples/pdynload/spj2/prog/expected b/testsuite/pdynload/spj2/prog/expected similarity index 100% rename from examples/pdynload/spj2/prog/expected rename to testsuite/pdynload/spj2/prog/expected diff --git a/examples/pdynload/spj3/Makefile b/testsuite/pdynload/spj3/Makefile similarity index 100% rename from examples/pdynload/spj3/Makefile rename to testsuite/pdynload/spj3/Makefile diff --git a/examples/pdynload/spj3/Plugin.hs b/testsuite/pdynload/spj3/Plugin.hs similarity index 100% rename from examples/pdynload/spj3/Plugin.hs rename to testsuite/pdynload/spj3/Plugin.hs diff --git a/examples/pdynload/spj3/api/API.hs b/testsuite/pdynload/spj3/api/API.hs similarity index 100% rename from examples/pdynload/spj3/api/API.hs rename to testsuite/pdynload/spj3/api/API.hs diff --git a/examples/pdynload/spj3/prog/Main.hs b/testsuite/pdynload/spj3/prog/Main.hs similarity index 100% rename from examples/pdynload/spj3/prog/Main.hs rename to testsuite/pdynload/spj3/prog/Main.hs diff --git a/examples/pdynload/spj3/prog/expected b/testsuite/pdynload/spj3/prog/expected similarity index 100% rename from examples/pdynload/spj3/prog/expected rename to testsuite/pdynload/spj3/prog/expected diff --git a/examples/pdynload/spj3/prog/expected.604 b/testsuite/pdynload/spj3/prog/expected.604 similarity index 100% rename from examples/pdynload/spj3/prog/expected.604 rename to testsuite/pdynload/spj3/prog/expected.604 diff --git a/examples/pdynload/spj3/prog/expected.605 b/testsuite/pdynload/spj3/prog/expected.605 similarity index 100% rename from examples/pdynload/spj3/prog/expected.605 rename to testsuite/pdynload/spj3/prog/expected.605 diff --git a/examples/pdynload/spj4/Makefile b/testsuite/pdynload/spj4/Makefile similarity index 100% rename from examples/pdynload/spj4/Makefile rename to testsuite/pdynload/spj4/Makefile diff --git a/examples/pdynload/spj4/Plugin.hs b/testsuite/pdynload/spj4/Plugin.hs similarity index 100% rename from examples/pdynload/spj4/Plugin.hs rename to testsuite/pdynload/spj4/Plugin.hs diff --git a/examples/pdynload/spj4/api/API.hs b/testsuite/pdynload/spj4/api/API.hs similarity index 100% rename from examples/pdynload/spj4/api/API.hs rename to testsuite/pdynload/spj4/api/API.hs diff --git a/examples/pdynload/spj4/prog/Main.hs b/testsuite/pdynload/spj4/prog/Main.hs similarity index 100% rename from examples/pdynload/spj4/prog/Main.hs rename to testsuite/pdynload/spj4/prog/Main.hs diff --git a/examples/pdynload/spj4/prog/expected b/testsuite/pdynload/spj4/prog/expected similarity index 100% rename from examples/pdynload/spj4/prog/expected rename to testsuite/pdynload/spj4/prog/expected diff --git a/examples/pdynload/typealias/Makefile b/testsuite/pdynload/typealias/Makefile similarity index 100% rename from examples/pdynload/typealias/Makefile rename to testsuite/pdynload/typealias/Makefile diff --git a/examples/pdynload/typealias/Plugin.hs b/testsuite/pdynload/typealias/Plugin.hs similarity index 100% rename from examples/pdynload/typealias/Plugin.hs rename to testsuite/pdynload/typealias/Plugin.hs diff --git a/examples/pdynload/typealias/api/API.hs b/testsuite/pdynload/typealias/api/API.hs similarity index 100% rename from examples/pdynload/typealias/api/API.hs rename to testsuite/pdynload/typealias/api/API.hs diff --git a/examples/pdynload/typealias/prog/Main.hs b/testsuite/pdynload/typealias/prog/Main.hs similarity index 100% rename from examples/pdynload/typealias/prog/Main.hs rename to testsuite/pdynload/typealias/prog/Main.hs diff --git a/examples/pdynload/typealias/prog/expected b/testsuite/pdynload/typealias/prog/expected similarity index 100% rename from examples/pdynload/typealias/prog/expected rename to testsuite/pdynload/typealias/prog/expected diff --git a/examples/pdynload/univquant/Makefile b/testsuite/pdynload/univquant/Makefile similarity index 100% rename from examples/pdynload/univquant/Makefile rename to testsuite/pdynload/univquant/Makefile diff --git a/examples/pdynload/univquant/Plugin.hs b/testsuite/pdynload/univquant/Plugin.hs similarity index 100% rename from examples/pdynload/univquant/Plugin.hs rename to testsuite/pdynload/univquant/Plugin.hs diff --git a/examples/pdynload/univquant/api/API.hs b/testsuite/pdynload/univquant/api/API.hs similarity index 100% rename from examples/pdynload/univquant/api/API.hs rename to testsuite/pdynload/univquant/api/API.hs diff --git a/examples/pdynload/univquant/prog/Main.hs b/testsuite/pdynload/univquant/prog/Main.hs similarity index 100% rename from examples/pdynload/univquant/prog/Main.hs rename to testsuite/pdynload/univquant/prog/Main.hs diff --git a/examples/pdynload/univquant/prog/expected b/testsuite/pdynload/univquant/prog/expected similarity index 100% rename from examples/pdynload/univquant/prog/expected rename to testsuite/pdynload/univquant/prog/expected diff --git a/examples/pkgconf/null/Makefile b/testsuite/pkgconf/null/Makefile similarity index 100% rename from examples/pkgconf/null/Makefile rename to testsuite/pkgconf/null/Makefile diff --git a/examples/pkgconf/null/Null.hs b/testsuite/pkgconf/null/Null.hs similarity index 100% rename from examples/pkgconf/null/Null.hs rename to testsuite/pkgconf/null/Null.hs diff --git a/examples/pkgconf/null/api/API.hs b/testsuite/pkgconf/null/api/API.hs similarity index 100% rename from examples/pkgconf/null/api/API.hs rename to testsuite/pkgconf/null/api/API.hs diff --git a/examples/pkgconf/null/api/package.conf.in b/testsuite/pkgconf/null/api/package.conf.in similarity index 100% rename from examples/pkgconf/null/api/package.conf.in rename to testsuite/pkgconf/null/api/package.conf.in diff --git a/testsuite/pkgconf/null/dont_test b/testsuite/pkgconf/null/dont_test new file mode 100644 index 0000000..e69de29 diff --git a/examples/pkgconf/null/prog/Main.hs b/testsuite/pkgconf/null/prog/Main.hs similarity index 79% rename from examples/pkgconf/null/prog/Main.hs rename to testsuite/pkgconf/null/prog/Main.hs index 9eb9b68..46be64f 100644 --- a/examples/pkgconf/null/prog/Main.hs +++ b/testsuite/pkgconf/null/prog/Main.hs @@ -6,7 +6,7 @@ import System.Plugins import API main = do - let includes = TOP ++ "/examples/load/null/api" + let includes = TOP ++ "/testsuite/load/null/api" (_,v) <- load "../Null.o" ["."] ["../api/package.conf"] "resource" putStrLn ( show (a v) ) diff --git a/examples/plugs/plugs/Main.hs b/testsuite/plugs/plugs/Main.hs similarity index 100% rename from examples/plugs/plugs/Main.hs rename to testsuite/plugs/plugs/Main.hs diff --git a/examples/plugs/plugs/Makefile b/testsuite/plugs/plugs/Makefile similarity index 100% rename from examples/plugs/plugs/Makefile rename to testsuite/plugs/plugs/Makefile diff --git a/examples/plugs/plugs/expected b/testsuite/plugs/plugs/expected similarity index 100% rename from examples/plugs/plugs/expected rename to testsuite/plugs/plugs/expected diff --git a/examples/plugs/plugs/test.in b/testsuite/plugs/plugs/test.in similarity index 100% rename from examples/plugs/plugs/test.in rename to testsuite/plugs/plugs/test.in diff --git a/examples/plugs/runplugs/Main.hs b/testsuite/plugs/runplugs/Main.hs similarity index 100% rename from examples/plugs/runplugs/Main.hs rename to testsuite/plugs/runplugs/Main.hs diff --git a/examples/plugs/runplugs/Makefile b/testsuite/plugs/runplugs/Makefile similarity index 100% rename from examples/plugs/runplugs/Makefile rename to testsuite/plugs/runplugs/Makefile diff --git a/examples/plugs/runplugs/expected b/testsuite/plugs/runplugs/expected similarity index 100% rename from examples/plugs/runplugs/expected rename to testsuite/plugs/runplugs/expected diff --git a/examples/plugs/runplugs/test.in b/testsuite/plugs/runplugs/test.in similarity index 100% rename from examples/plugs/runplugs/test.in rename to testsuite/plugs/runplugs/test.in diff --git a/examples/reload/null/Makefile b/testsuite/reload/null/Makefile similarity index 100% rename from examples/reload/null/Makefile rename to testsuite/reload/null/Makefile diff --git a/examples/reload/null/Null.hs b/testsuite/reload/null/Null.hs similarity index 100% rename from examples/reload/null/Null.hs rename to testsuite/reload/null/Null.hs diff --git a/examples/reload/null/api/API.hs b/testsuite/reload/null/api/API.hs similarity index 100% rename from examples/reload/null/api/API.hs rename to testsuite/reload/null/api/API.hs diff --git a/examples/reload/null/prog/Main.hs b/testsuite/reload/null/prog/Main.hs similarity index 100% rename from examples/reload/null/prog/Main.hs rename to testsuite/reload/null/prog/Main.hs diff --git a/examples/reload/null/prog/expected b/testsuite/reload/null/prog/expected similarity index 100% rename from examples/reload/null/prog/expected rename to testsuite/reload/null/prog/expected diff --git a/examples/shell/shell/API.hs b/testsuite/shell/shell/API.hs similarity index 100% rename from examples/shell/shell/API.hs rename to testsuite/shell/shell/API.hs diff --git a/examples/shell/shell/Main.hs b/testsuite/shell/shell/Main.hs similarity index 100% rename from examples/shell/shell/Main.hs rename to testsuite/shell/shell/Main.hs diff --git a/examples/shell/shell/Makefile b/testsuite/shell/shell/Makefile similarity index 100% rename from examples/shell/shell/Makefile rename to testsuite/shell/shell/Makefile diff --git a/examples/shell/shell/Plugin.hs b/testsuite/shell/shell/Plugin.hs similarity index 100% rename from examples/shell/shell/Plugin.hs rename to testsuite/shell/shell/Plugin.hs diff --git a/examples/shell/shell/Plugin.stub b/testsuite/shell/shell/Plugin.stub similarity index 100% rename from examples/shell/shell/Plugin.stub rename to testsuite/shell/shell/Plugin.stub diff --git a/examples/shell/shell/README b/testsuite/shell/shell/README similarity index 100% rename from examples/shell/shell/README rename to testsuite/shell/shell/README diff --git a/testsuite/shell/shell/dont_test b/testsuite/shell/shell/dont_test new file mode 100644 index 0000000..e69de29 diff --git a/examples/shell/simple/Main.hs b/testsuite/shell/simple/Main.hs similarity index 100% rename from examples/shell/simple/Main.hs rename to testsuite/shell/simple/Main.hs diff --git a/examples/shell/simple/Makefile b/testsuite/shell/simple/Makefile similarity index 100% rename from examples/shell/simple/Makefile rename to testsuite/shell/simple/Makefile diff --git a/examples/shell/simple/Plugin.hs b/testsuite/shell/simple/Plugin.hs similarity index 100% rename from examples/shell/simple/Plugin.hs rename to testsuite/shell/simple/Plugin.hs diff --git a/examples/shell/simple/Plugin.stub b/testsuite/shell/simple/Plugin.stub similarity index 100% rename from examples/shell/simple/Plugin.stub rename to testsuite/shell/simple/Plugin.stub diff --git a/examples/shell/simple/README b/testsuite/shell/simple/README similarity index 100% rename from examples/shell/simple/README rename to testsuite/shell/simple/README diff --git a/examples/shell/simple/StringProcessorAPI.hs b/testsuite/shell/simple/StringProcessorAPI.hs similarity index 100% rename from examples/shell/simple/StringProcessorAPI.hs rename to testsuite/shell/simple/StringProcessorAPI.hs diff --git a/testsuite/shell/simple/dont_test b/testsuite/shell/simple/dont_test new file mode 100644 index 0000000..e69de29 diff --git a/examples/unload/null/Makefile b/testsuite/unload/null/Makefile similarity index 100% rename from examples/unload/null/Makefile rename to testsuite/unload/null/Makefile diff --git a/examples/unload/null/Null.hs b/testsuite/unload/null/Null.hs similarity index 100% rename from examples/unload/null/Null.hs rename to testsuite/unload/null/Null.hs diff --git a/examples/unload/null/api/API.hs b/testsuite/unload/null/api/API.hs similarity index 100% rename from examples/unload/null/api/API.hs rename to testsuite/unload/null/api/API.hs diff --git a/examples/unload/null/prog/Main.hs b/testsuite/unload/null/prog/Main.hs similarity index 100% rename from examples/unload/null/prog/Main.hs rename to testsuite/unload/null/prog/Main.hs diff --git a/examples/unload/null/prog/expected b/testsuite/unload/null/prog/expected similarity index 100% rename from examples/unload/null/prog/expected rename to testsuite/unload/null/prog/expected diff --git a/examples/unload/sjwtrap/Makefile b/testsuite/unload/sjwtrap/Makefile similarity index 100% rename from examples/unload/sjwtrap/Makefile rename to testsuite/unload/sjwtrap/Makefile diff --git a/examples/unload/sjwtrap/Null.hs b/testsuite/unload/sjwtrap/Null.hs similarity index 100% rename from examples/unload/sjwtrap/Null.hs rename to testsuite/unload/sjwtrap/Null.hs diff --git a/examples/unload/sjwtrap/api/API.hs b/testsuite/unload/sjwtrap/api/API.hs similarity index 100% rename from examples/unload/sjwtrap/api/API.hs rename to testsuite/unload/sjwtrap/api/API.hs diff --git a/examples/unload/sjwtrap/prog/Main.hs b/testsuite/unload/sjwtrap/prog/Main.hs similarity index 100% rename from examples/unload/sjwtrap/prog/Main.hs rename to testsuite/unload/sjwtrap/prog/Main.hs diff --git a/examples/unload/sjwtrap/prog/expected b/testsuite/unload/sjwtrap/prog/expected similarity index 100% rename from examples/unload/sjwtrap/prog/expected rename to testsuite/unload/sjwtrap/prog/expected diff --git a/examples/unloadAll/null/Dep.hs b/testsuite/unloadAll/null/Dep.hs similarity index 100% rename from examples/unloadAll/null/Dep.hs rename to testsuite/unloadAll/null/Dep.hs diff --git a/examples/unloadAll/null/Makefile b/testsuite/unloadAll/null/Makefile similarity index 100% rename from examples/unloadAll/null/Makefile rename to testsuite/unloadAll/null/Makefile diff --git a/examples/unloadAll/null/Null.hs b/testsuite/unloadAll/null/Null.hs similarity index 100% rename from examples/unloadAll/null/Null.hs rename to testsuite/unloadAll/null/Null.hs diff --git a/examples/unloadAll/null/api/API.hs b/testsuite/unloadAll/null/api/API.hs similarity index 100% rename from examples/unloadAll/null/api/API.hs rename to testsuite/unloadAll/null/api/API.hs diff --git a/examples/unloadAll/null/prog/Main.hs b/testsuite/unloadAll/null/prog/Main.hs similarity index 100% rename from examples/unloadAll/null/prog/Main.hs rename to testsuite/unloadAll/null/prog/Main.hs diff --git a/examples/unloadAll/null/prog/expected b/testsuite/unloadAll/null/prog/expected similarity index 100% rename from examples/unloadAll/null/prog/expected rename to testsuite/unloadAll/null/prog/expected