Chicken - make check-examples run like other examples - not all run very well though!

Examples/Makefile.in

@@ -1122,7 +1122,7 @@ CHICKEN_SHAREDLIBOPTS = @CHICKENSHAREDLIB@  $(SYSLIBS)
 CHICKEN_CFLAGS = @CHICKENOPTS@
 CHICKENOPTS = -quiet
 CHICKEN_MAIN =
-CHICKEN_SCRIPT = $(RUNME).ss
+CHICKEN_SCRIPT = $(RUNME).scm
 
 # SWIG produces $(ISRCS) (the C wrapper file)
 # and $(CHICKEN_GENERATED_SCHEME) (the Scheme wrapper file):
@@ -1208,7 +1208,7 @@ chicken_externalhdr:
 # -----------------------------------------------------------------
 
 chicken_run:
-	$(RUNTOOL) $(CHICKEN_CSI) $(CHICKEN_SCRIPT) $(RUNPIPE)
+	env LD_LIBRARY_PATH=. $(RUNTOOL) $(CHICKEN_CSI) $(CHICKEN_SCRIPT) $(RUNPIPE)
 
 # -----------------------------------------------------------------
 # Version display

Examples/chicken/class/Makefile

@@ -10,13 +10,13 @@ CFLAGS      =
 VARIANT     =
 
 # uncomment the following lines to build a static exe (only pick one of the CHICKEN_MAIN lines)
-#CHICKEN_MAIN = test-lowlevel-class.scm
+#CHICKEN_MAIN = runme-lowlevel.scm
-#CHICKEN_MAIN = test-tinyclos-class.scm
+#CHICKEN_MAIN = runme-tinyclos.scm
 #VARIANT      = _static
 
 check: build
-	env LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH csi test-lowlevel-class.scm
+	$(MAKE) -f $(TOP)/Makefile CHICKEN_SCRIPT='runme-lowlevel.scm' chicken_run
-	env LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH csi test-tinyclos-class.scm
+	$(MAKE) -f $(TOP)/Makefile CHICKEN_SCRIPT='runme-tinyclos.scm' chicken_run
 
 build: $(TARGET) $(TARGET)_proxy
 

Examples/chicken/constants/Makefile

@@ -10,11 +10,11 @@ CFLAGS      =
 VARIANT     = 
 
 # uncomment the following two lines to build a static exe
-#CHICKEN_MAIN = test-constants.scm
+#CHICKEN_MAIN = runme.scm
 #VARIANT      = _static
 
 check: build
-	csi test-constants.scm
+	$(MAKE) -f $(TOP)/Makefile chicken_run
 
 build: $(TARGET)
 

Examples/chicken/multimap/Makefile

@@ -10,11 +10,11 @@ CFLAGS      =
 VARIANT     = 
 
 # uncomment the following two lines to build a static exe
-#CHICKEN_MAIN = test-multimap.scm
+#CHICKEN_MAIN = runme.scm
 #VARIANT      = _static
 
 check: build
-	env LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH csi test-multimap.scm
+	$(MAKE) -f $(TOP)/Makefile chicken_run
 
 build: $(TARGET)
 

Examples/chicken/multimap/runme.scm

@@ -1,4 +1,3 @@
-;; run with './multimap test-multimap.scm'
 ;; feel free to uncomment and comment sections
 
 (load-library 'example "multimap.so")

Examples/chicken/overload/Makefile

@@ -10,11 +10,11 @@ CFLAGS      =
 VARIANT     = 
 
 # uncomment the following lines to build a static exe
-#CHICKEN_MAIN = test-overload.scm
+#CHICKEN_MAIN = runme.scm
 #VARIANT      = _static
 
 check: build
-	env LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH csi test-overload.scm
+	$(MAKE) -f $(TOP)/Makefile chicken_run
 
 build: $(TARGET)
 

Examples/chicken/simple/Makefile

@@ -10,11 +10,11 @@ CFLAGS      =
 VARIANT     = 
 
 # uncomment the following two lines to build a static exe
-#CHICKEN_MAIN = test-simple.scm
+#CHICKEN_MAIN = runme.scm
 #VARIANT      = _static
 
 check: build
-	env LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH csi test-simple.scm
+	$(MAKE) -f $(TOP)/Makefile chicken_run
 
 build: $(TARGET)