Adding command-line option tests.

Makefile

@@ -202,18 +202,15 @@ test-memory: chibi-scheme-ulimit$(EXE)
 test-build:
 	MAKE=$(MAKE) ./tests/build/build-tests.sh
 
+test-run:
+	./tests/run/command-line-tests.sh
+
 test-ffi: chibi-scheme$(EXE)
 	$(CHIBI) tests/ffi/ffi-tests.scm
 
 test-snow: chibi-scheme$(EXE)
 	$(CHIBI) tests/snow/snow-tests.scm
 
-test-numbers: chibi-scheme$(EXE)
-	$(CHIBI) -xchibi tests/numeric-tests.scm
-
-test-flonums: chibi-scheme$(EXE)
-	$(CHIBI) -xchibi tests/flonum-tests.scm
-
 test-unicode: chibi-scheme$(EXE)
 	$(CHIBI) -xchibi tests/unicode-tests.scm
 
@@ -239,7 +236,8 @@ bench-gabriel: chibi-scheme$(EXE)
 # Packaging
 
 clean: clean-libs
-	-$(RM) *.o *.i *.s *.8 tests/basic/*.out tests/basic/*.err
+	-$(RM) *.o *.i *.s *.8 tests/basic/*.out tests/basic/*.err \
+	    tests/run/*.out tests/run/*.err
 
 cleaner: clean
 	-$(RM) chibi-scheme$(EXE) chibi-scheme-static$(EXE) chibi-scheme-ulimit$(EXE) \

tests/run/command-line-tests.sh

@@ -0,0 +1,33 @@
+#!/bin/sh
+
+# Test chibi-scheme command-line options.
+# Should be run from a standard build.
+
+TESTDIR=$(dirname $0)
+FAILURES=0
+i=0
+
+run_chibi() {
+    LD_LIBRARY_PATH=.:$LD_LIBRARY_PATH DYLD_LIBRARY_PATH=.:$DYLD_LIBRARY_PATH CHIBI_MODULE_PATH=lib ./chibi-scheme "$@"
+}
+
+for t in $TESTDIR/*.args; do
+    IFS=$'\r\n' GLOBIGNORE='*' :; args=($(cat $t))
+    run_chibi ${args[@]} 2> ${t%.args}.err > ${t%.args}.out
+    if diff -w -q ${t%.args}.out ${t%.args}.res \
+            && ([ ! -e ${t%.args}.err-res ] || \
+                    diff -w -q ${t%.args}.err ${t%.args}.err-res); then
+        echo "[PASS] $(basename ${t%.args})"
+    else
+        echo "[FAIL] $(basename ${t%.args})"
+        FAILURES=$((FAILURES + 1))
+    fi
+    i=$((i+1))
+done
+
+if [ $FAILURES = 0 ]; then
+    echo "command-line-tests: all ${i} tests passed"
+else
+    echo "command-line-tests: ${FAILURES} out of ${i} tests failed"
+    exit 1
+fi

tests/run/lib/fact.sld

@@ -0,0 +1,8 @@
+(define-library (fact)
+  (export fact)
+  (import (scheme base))
+  (begin
+    (define (fact n)
+      (if (< n 2)
+          1
+          (* n (fact (- n 1)))))))

tests/run/lib/fib.scm

@@ -0,0 +1,4 @@
+(define (fib n)
+  (if (< n 2)
+      1
+      (+ (fib (- n 1)) (fib (- n 2)))))

tests/run/lib/hello.sld

@@ -0,0 +1,11 @@
+(define-library (hello)
+  (import (scheme base))
+  (begin
+    (define (main args)
+      (write-string "Hello, ")
+      (write-string (if (pair? (cdr args)) (cadr args) "world!"))
+      (newline))
+    (define (bye args)
+      (write-string "Goodbye, ")
+      (write-string (if (pair? (cdr args)) (cadr args) "world!"))
+      (newline))))

tests/run/test00-p.args

@@ -0,0 +1,2 @@
+-p
+(map (lambda (x) (* x x)) '(0 1 2 3 4 5))

tests/run/test00-p.res

@@ -0,0 +1 @@
+(0 1 4 9 16 25)

tests/run/test01-p-short.args

@@ -0,0 +1 @@
+-p(map (lambda (x) (* x x)) '(0 1 2 3 4 5))

tests/run/test01-p-short.res

@@ -0,0 +1 @@
+(0 1 4 9 16 25)

tests/run/test02-h.args

@@ -0,0 +1,2 @@
+-h1M
+-p(map (lambda (x) (* x x)) '(0 1 2 3 4 5))

tests/run/test02-h.res

@@ -0,0 +1 @@
+(0 1 4 9 16 25)

tests/run/test03-q.args

@@ -0,0 +1,2 @@
+-q
+-p(map (lambda (x) (* x x)) '(0 1 2 3 4 5))

tests/run/test03-q.res

@@ -0,0 +1 @@
+(0 1 4 9 16 25)

tests/run/test04-Q.args

@@ -0,0 +1,2 @@
+-Q
+-p(+ 2 2)

tests/run/test04-Q.res

@@ -0,0 +1 @@
+4

tests/run/test05-xscheme-r5rs.args

@@ -0,0 +1,2 @@
+-x(scheme r5rs)
+-p(map (lambda (x) (* x x)) '(0 1 2 3 4 5))

tests/run/test05-xscheme-r5rs.res

@@ -0,0 +1 @@
+(0 1 4 9 16 25)

tests/run/test06-xscheme-base.args

@@ -0,0 +1,2 @@
+-xscheme.base
+-p(map (lambda (x) (* x x)) '(0 1 2 3 4 5))

tests/run/test06-xscheme-base.res

@@ -0,0 +1 @@
+(0 1 4 9 16 25)

tests/run/test07-xchibi.args

@@ -0,0 +1,2 @@
+-x(chibi)
+-p(map (lambda (x) (* x x)) '(0 1 2 3 4 5))

tests/run/test07-xchibi.res

@@ -0,0 +1 @@
+(0 1 4 9 16 25)

tests/run/test08-xchibi-primitive.args

@@ -0,0 +1,2 @@
+-x(chibi primitive)
+-p(+ 2 2)

tests/run/test08-xchibi-primitive.res

@@ -0,0 +1 @@
+4

tests/run/test09-m.args

@@ -0,0 +1,4 @@
+-m
+srfi.1
+-p
+(iota 5)

tests/run/test09-m.res

@@ -0,0 +1 @@
+(0 1 2 3 4)

tests/run/test10-xscheme-base-m.args

@@ -0,0 +1,3 @@
+-x(scheme base)
+-m(srfi 1)
+-p(iota 5)

tests/run/test10-xscheme-base-m.res

@@ -0,0 +1 @@
+(0 1 2 3 4)

tests/run/test11-xscheme-r5rs-m.args

@@ -0,0 +1,3 @@
+-xscheme.r5rs
+-m(srfi 1)
+-p(iota 5)

tests/run/test11-xscheme-r5rs-m.res

@@ -0,0 +1 @@
+(0 1 2 3 4)

tests/run/test12-xchibi-m.args

@@ -0,0 +1,3 @@
+-xchibi
+-m(srfi 1)
+-p(iota 5)

tests/run/test12-xchibi-m.res

@@ -0,0 +1 @@
+(0 1 2 3 4)

tests/run/test13-A-m.args

@@ -0,0 +1,3 @@
+-Atests/run/lib
+-mfact
+-p(fact 5)

tests/run/test13-A-m.res

@@ -0,0 +1 @@
+120

tests/run/test14-R.args

@@ -0,0 +1,2 @@
+-Atests/run/lib
+-Rhello

tests/run/test14-R.res

@@ -0,0 +1 @@
+Hello, world!

tests/run/test15-R-args.args

@@ -0,0 +1,4 @@
+-Atests/run/lib
+-Rhello
+--
+Schemer!

tests/run/test15-R-args.res

@@ -0,0 +1 @@
+Hello, Schemer!

tests/run/test16-R-r.args

@@ -0,0 +1,3 @@
+-Atests/run/lib
+-Rhello
+-rbye

tests/run/test16-R-r.res

@@ -0,0 +1 @@
+Goodbye, world!

tests/run/test17-R-r-args.args

@@ -0,0 +1,5 @@
+-Atests/run/lib
+-Rhello
+-rbye
+--
+Schemer!

tests/run/test17-R-r-args.res

@@ -0,0 +1 @@
+Goodbye, Schemer!

tests/run/test18-t.args

@@ -0,0 +1,3 @@
+-msrfi.1
+-tsrfi.1.append-reverse
+-p(append-reverse (quote(3 2 1)) (quote(4 5)))

tests/run/test18-t.err-res

@@ -0,0 +1,8 @@
+> (append-reverse (3 2 1) (4 5))
+| > (append-reverse (2 1) (3 4 5))
+| | > (append-reverse (1) (2 3 4 5))
+| | | > (append-reverse () (1 2 3 4 5))
+| | | (1 2 3 4 5)
+| | (1 2 3 4 5)
+| (1 2 3 4 5)
+(1 2 3 4 5)

tests/run/test18-t.res

@@ -0,0 +1 @@
+(1 2 3 4 5)

tests/run/test19-l.args

@@ -0,0 +1,3 @@
+-Atests/run/lib
+-lfib.scm
+-p(fib 5)

tests/run/test19-l.res

@@ -0,0 +1 @@
+8