Re: [Chicken-hackers] address@hidden: Re: 4.8.0 release?]

[Felix]

> I groveled over the diff between the Linux and Cygwin outputs, and I've
> found these issues:
> 
> 1) The signal-tests.scm test can be run fine on Cygwin, though not
> on MinGW.  Either the test for "windows" is too coarse, or "windows"
> itself shouldn't be defined on Cygwin (which is what most systems I
> know do).  The Right Thing at this point is to fix the test, since it's
> a one-line change.
> 
> 2) The same is true of the Windows-conditionalized parts of
> port-tests.scm.
> 
> 3) The deployment and reinstall tests aren't properly conditionalized
> for the shared library extension, so while they sort of work, there is
> a last-minute crash.  Here's the tail of the log:

Does the attached patch improve things?


cheers,
felix

diff --git a/csc.scm b/csc.scm
index 5c49972..8f40069 100644
--- a/csc.scm
+++ b/csc.scm
@@ -120,7 +120,9 @@
 (define generate-manifest #f)
 
 (define libchicken
-  (string-append "lib" INSTALL_LIB_NAME))
+  (if cygwin
+      (string-append "cyg" INSTALL_LIB_NAME "-0")
+      (string-append "lib" INSTALL_LIB_NAME)))
 
 (define default-library
   (string-append libchicken "." library-extension))
@@ -960,7 +962,7 @@ EOF
              (target-lib-path) 
              libchicken
              (cond (osx "dylib")
-                   (win "dll")
+                   ((or win cygwin) "dll")
                    (else (string-append
                            "so."
                            (number->string BINARY_VERSION)))))))
diff --git a/tests/port-tests.scm b/tests/port-tests.scm
index df11e71..72d6861 100644
--- a/tests/port-tests.scm
+++ b/tests/port-tests.scm
@@ -121,7 +121,7 @@ EOF
                ((exn i/o file) (printf "OK\n") okay))))))))
 
 (cond-expand
-  ((not windows)
+  ((not mingw32)
 
    (define proc (process-fork (lambda () (tcp-accept (tcp-listen 8080)))))
 
@@ -166,7 +166,7 @@ EOF
     ;;(check (port->fileno in))
     (check (flush-output out))
 
-    #+(not windows) 
+    #+(not mingw32) 
     (begin
       (check (file-test-lock out))
       (check (file-lock out))
@@ -189,7 +189,7 @@ EOF
     (check (read-u8vector 5 in))
     (check "read-u8vector!" (let ((dest (make-u8vector 5)))
                               (read-u8vector! 5 dest in)))
-    #+(not windows) 
+    #+(not mingw32) 
     (begin
       (check (file-test-lock in))
       (check (file-lock in))
diff --git a/tests/signal-tests.scm b/tests/signal-tests.scm
index b9e5f41..3d685e2 100644
--- a/tests/signal-tests.scm
+++ b/tests/signal-tests.scm
@@ -1,9 +1,9 @@
 ;;;; signal-tests.scm
 
 
-#+windows
+#+mingw32
 (begin
-  (print "this test can not be run on Windows")
+  (print "this test can not be run on Windows/mingw")
   (exit))