windows: fix make check

msvc/tests/Makefile

@@ -2,44 +2,18 @@ top_srcdir=..\..
 ECLDIR=../package/
 ECL=..\package\ecl.exe
 
-all: show-fails
+.PHONY: all
 
-.PHONY: do-regressions cleanup clean-sources update
+all: check
+
+check: config.lsp
+	set ECLDIR=$(ECLDIR)
+	$(ECL) -norc \
+                -load config.lsp \
+                -eval "(ecl-tests::run-tests '($(TESTS)))" \
+                -eval "(ext:quit)"
 
 config.lsp: $(top_srcdir)\src\tests\config.lsp.in ..\c\cut.exe Makefile
 	..\c\cut.exe "@builddir@" "./" \
-	          "@top_srcdir@" "../.." \
+	          "@true_srcdir@" "../src" \
 	  < $(top_srcdir)\src\tests\config.lsp.in > config.lsp
-
-output.ecl\regressions.log: config.lsp
-	$(MAKE) do-regressions
-
-do-regressions: regressions config.lsp
-	set ECLDIR=$(ECLDIR)
-	$(ECL) -norc -load config.lsp -eval "(ecl-tests::run-regressions-tests)" -eval "(ext:quit)"
-
-show-fails: regressions.log
-	type regressions.log
-
-#
-# Create directories
-#
-regressions.log: config.lsp
-	$(MAKE) do-regressions
-
-#
-# Cleanup
-#
-clean:
-	rm -rf output*
-
-clean-sources:
-	test -f config.lsp.in || rm -rf bugs
-	rm -rf ansi-tests quicklisp
-
-distclean: clean-sources clean
-	rm -rf cache
-
-update: clean-sources
-	$(MAKE) regressions
-

src/tests/config.lsp.in

@@ -21,6 +21,8 @@
         when (probe-file "configure.ac")
         return *default-pathname-defaults*))
 
+(setf *ecl-sources* (truename *ecl-sources*))
+
 (defvar *here* (merge-pathnames "@builddir@/"))
 (defvar *cache* (merge-pathnames "./cache/" *here*))
 

src/tests/normal-tests/run-program.lsp

@@ -37,9 +37,9 @@
              (with-run-program (arg-test ("a" "b c" "d \\" "e\ 4\\
 ")))) "ext:run-program doesn't escape arguments properly")
   #+windows
-  (is-false (equal '(nil :exited 0)
+  (is (null (equal '(nil :exited 0)
                    (with-run-program (arg-test ("a" "b c" "d \\" "e\ 4\\
-") :escape-arguments nil))) "ext:run-program doesn't escape arguments properly"))
+") :escape-arguments nil)))) "ext:run-program :ESCAPE-ARGUMENTS NIL doesn't work"))
 
 (test output-streams
   ;; error is a separate stream
@@ -61,19 +61,17 @@
             (with-run-program (io/err nil)
               (format io/err "42~%")))
   ;; process will have :eof on input and should quit with "1"
-  (is-equal '(nil :exited 1) (with-run-program (io/err nil :input nil))))
+  (is-equal '(nil :exited 1) (with-run-program (io/err nil :input nil)))
+  )
 
-(test stream-values
-  (is-equal '(nil :exited 0)
-            (with-run-program (print-test nil :output nil :error nil :input nil)))
-  (is-equal '(nil :exited 0)
-            (with-run-program (print-test nil :output nil :error :output :input nil)))
-  (is-equal '(nil :exited 0)
-            (with-run-program (print-test nil :output nil :error :output :input :stream)))
-  (is-equal '(nil :exited 0)
-            (with-run-program (print-test nil :output :stream :error :output :input :stream)))
-  (is-equal '(nil :exited 0)
-            (with-run-program (print-test nil :output :stream :error :stream :input :stream)))
+(test stream-values ()
+  (finishes (with-run-program (print-test nil :output nil :error nil :input nil)))
+  (finishes (with-run-program (print-test nil :output nil :error :output :input nil)))
+  (finishes (with-run-program (print-test nil :output nil :error :output :input :stream)))
+  (finishes (with-run-program
+	     (print-test nil :output :stream :error :output :input :stream)))
+  (finishes (with-run-program
+	     (print-test nil :output :stream :error :stream :input :stream)))
   (signals simple-error
     (with-run-program (print-test nil :output :bam :error :stream :input :stream))))