mv contrib/eus64-check to euslisp/test

Author: k-okada

.travis.sh

@@ -87,6 +87,7 @@ if [ "$QEMU" != "" ]; then
     export EXIT_STATUS=0;
     set +e
     # run test in EusLisp/test
+    make -C test
     for test_l in test/*.l; do
 
         travis_time_start euslisp.${test_l##*/}.test
@@ -235,6 +236,7 @@ if [[ "`uname -m`" == "aarch"* ]]; then
 fi
 
     # run test in EusLisp/test
+    make -C $CI_SOURCE_PATH/test
     for test_l in $CI_SOURCE_PATH/test/*.l; do
 
         travis_time_start euslisp.${test_l##*/}.test

contrib/eus64-check/Makefile

@@ -0,0 +1,42 @@
+GCC_MACHINE=$(shell gcc -dumpmachine)
+$(info "-- GCC_MACHINE = ${GCC_MACHINE}")
+OS=$(shell uname -s | sed 's/[^A-Za-z1-9].*//')
+$(info "--      OS = ${OS}")
+ifeq ($(OS),Linux)
+ export MAKEFILE=Makefile.Linux
+endif
+ifeq ($(OS),CYGWIN)
+ export MAKEFILE=Makefile.Cygwin
+endif
+ifeq ($(OS),Darwin)
+ export MAKEFILE=Makefile.Darwin
+endif
+
+$(info "-- MAKEFILE = ${MAKEFILE}")
+
+# set EUSDIR if not defined
+export EUSDIR?=$(CURDIR)/..
+$(info "--  EUSDIR = ${EUSDIR}")
+
+include $(MAKEFILE)
+
+SRC=test_foreign.c
+OBJ=$(basename $(SRC)).o
+LIB=$(basename $(SRC)).$(LSFX)
+
+$(LIB): $(OBJ)
+	$(LD) $(SOFLAGS) $(OUTOPT)$(LIB) $(OBJ) $(LDFLAGS)
+	@echo "Try make test"
+
+$(OBJ): $(SRC)
+	$(CC) $(CFLAGS) -DCOMPILE_LIB -c $(SRC) $(OBJOPT)$(OBJ)
+
+clean:
+	rm -f $(LIB) $(OBJ)
+
+test: $(LIB)
+	teusgl eus64-test.l
+
+clean :
+	\rm -f *.o *.so
+

test/Makefile

@@ -0,0 +1,12 @@
+CC = c++
+CFLAGS = -O2 -falign-functions=4 -DCygwin -I$(EUSDIR)/include
+LDFLAGS =
+OBJOPT = -o
+OUTOPT = -o
+LD = c++ -shared -falign-functions=4
+EXELD = c++ -falign-functions=4
+SOFLAGS =
+EXESFX = .exe
+LSFX = dll
+LPFX = lib
+LIBS = -L$(ARCHDIR) -lRAPID

test/Makefile.Cygwin

@@ -0,0 +1,12 @@
+CC = c++
+CFLAGS = -O2 -falign-functions=8 -fPIC -DDarwin -DGCC -I$(EUSDIR)/include
+LDFLAGS =
+OBJOPT = -o
+OUTOPT = -o
+LD = c++
+SOFLAGS = -dynamiclib -flat_namespace -undefined suppress
+EXELD = c++
+EXESFX =
+LSFX = so
+LPFX = lib
+LIBS = -L$(ARCHDIR) -lRAPID

test/Makefile.Darwin

@@ -0,0 +1,33 @@
+CC = c++
+CFLAGS = -O2 -DLinux -DGCC -I$(EUSDIR)/include
+LDFLAGS =
+OBJOPT = -o
+OUTOPT = -o
+LD = c++
+SOFLAGS = -shared
+EXELD = c++
+EXESFX =
+LSFX = so
+LPFX = lib
+
+ifneq (,$(findstring 64,$(shell gcc -dumpmachine)))
+ CFLAGS+=-falign-functions=8
+else
+ CFLAGS+=-falign-functions=4
+endif
+
+ifneq ($(shell gcc -dumpmachine | egrep "^(arm|aarch)"),)
+  LDFLAGS+=-Wl,-z,execstack
+  CFLAGS+=-DARM -fPIC
+endif
+ifneq ($(shell gcc -dumpmachine | grep "^x86_64"),)
+  CFLAGS+=-fPIC
+endif
+
+ifneq ($(shell gcc -dumpmachine | grep "i.*86-linux"),)
+CC += -m32
+LD += -m32
+EXELD += -m32
+endif
+
+

test/Makefile.Linux

@@ -15,7 +15,7 @@
   (defforeign ret-float *testmod* "ret_float" () :float32)
   (defforeign ret-double *testmod* "ret_double" () :float)
   (defforeign ret-long *testmod* "ret_long" () :integer)
-  
+
   (defforeign set-ifunc *testmod* "set_ifunc" (:integer) :integer)
   (defforeign set-ffunc *testmod* "set_ffunc" (:integer) :integer)
 
@@ -34,5 +34,3 @@
   (defforeign get-size-long    *testmod* "get_size_of_long" () :integer)
   (defforeign get-size-int     *testmod* "get_size_of_int" () :integer)
   )
-
-

contrib/eus64-check/eus64-module.l renamed to test/test-foreign-module.l

@@ -1,4 +1,4 @@
-(load "eus64-module.l")
+(load "test-foreign-module.l")
 (require :unittest "lib/llib/unittest.l")
 
 (init-unit-test)
@@ -9,7 +9,7 @@
   (format t "pointer size ~D ~D~%"
 	  lisp::sizeof-* (get-size-pointer))
   (assert (= lisp::sizeof-* (get-size-pointer)))
-  
+
   (format t "double size ~D ~D~%"
 	  lisp::sizeof-double (get-size-double))
   (assert (= lisp::sizeof-double (get-size-double)))
@@ -50,7 +50,7 @@ test-testd = 1.23456
   (assert (eps= 1.23456 ret))
 
   ;;
-  (setq f (piped-fork "irteusgl eus64-module.l '(progn (test-testd 100 101 102 103 104 105 1000.000000 1010.000000 1020.000000 1030.000000 1040.000000 1050.000000 1060.000000 1070.000000 2080.000000 2090.000000 206 207)(exit 0))'"))
+  (setq f (piped-fork "eusg test-foreign-module.l '(progn (test-testd 100 101 102 103 104 105 1000.000000 1010.000000 1020.000000 1030.000000 1040.000000 1050.000000 1060.000000 1070.000000 2080.000000 2090.000000 206 207)(exit 0))'"))
   (assert (string= (read-line f) "100 101 102"))
   (assert (string= (read-line f) "103 104 105"))
   (assert (string= (read-line f) "1000.000000 1010.000000 1020.000000 1030.000000"))
@@ -74,7 +74,7 @@ test-testd = 1.23456
   (float3-test 0 0.1 0.2 0.3 0.4)
 
   ;;
-  (setq f (piped-fork "irteusgl eus64-module.l '(progn (float-test 0 0.1 0.2 0.3 0.4)(exit 0))'"))
+  (setq f (piped-fork "eusg test-foreign-module.l '(progn (float-test 0 0.1 0.2 0.3 0.4)(exit 0))'"))
   (assert (eps= (read-from-string (subseq (read-line f) 2)) 0.1)) ;; skip first 2 character
   (assert (eps= (read-from-string (subseq (read-line f) 2)) 0.2))
   (assert (eps= (read-from-string (subseq (read-line f) 2)) 0.3))
@@ -96,12 +96,12 @@ test-testd = 1.23456
   (double3-test 1 0.1 0.2 0.3 0.4)
 
   ;;
-  (setq f (piped-fork "irteusgl eus64-module.l '(progn (double-test 1 0.1 0.2 0.3 0.4)(exit 0))'"))
+  (setq f (piped-fork "eusg test-foreign-module.l '(progn (double-test 1 0.1 0.2 0.3 0.4)(exit 0))'"))
   (assert (eps= (read-from-string (subseq (read-line f) 2)) 0.1)) ;; skip first 2 character
   (assert (eps= (read-from-string (subseq (read-line f) 2)) 0.2))
   (assert (eps= (read-from-string (subseq (read-line f) 2)) 0.3))
   (assert (eps= (read-from-string (subseq (read-line f) 2)) 0.4))
-  (setq f (piped-fork "irteusgl eus64-module.l '(progn (double3-test 1 0.1 0.2 0.3 0.4)(exit 0))'"))
+  (setq f (piped-fork "eusg test-foreign-module.l '(progn (double3-test 1 0.1 0.2 0.3 0.4)(exit 0))'"))
   (assert (eps= (read-from-string (subseq (read-line f) 2)) 0.1)) ;; skip first 2 character
   (assert (eps= (read-from-string (subseq (read-line f) 2)) 0.2))
   (assert (eps= (read-from-string (subseq (read-line f) 2)) 0.3))
@@ -128,7 +128,7 @@ test-testd = 1.23456
   (lv-test (length iv) iv)
 
   ;;
-  (setq f (piped-fork "irteusgl eus64-module.l '(progn (setq iv (integer-vector 0 100 10000 1000000 100000000 10000000000))(lv-test (length iv) iv)(exit 0))'"))
+  (setq f (piped-fork "eusg test-foreign-module.l '(progn (setq iv (integer-vector 0 100 10000 1000000 100000000 10000000000))(lv-test (length iv) iv)(exit 0))'"))
   (assert (string= (read-line f) "size = 6"))
   (assert (string= (read-line f) "0: 0 0"))
   (assert (string= (read-line f) "1: 100 64"))
@@ -157,7 +157,7 @@ test-testd = 1.23456
   (dv-test (length fv) fv)
 
   ;;
-  (setq f (piped-fork "irteusgl eus64-module.l '(progn (setq fv (float-vector 0.1 0.2 0.3 0.5 0.7))(dv-test (length fv) fv)(exit 0))'"))
+  (setq f (piped-fork "eusg test-foreign-module.l '(progn (setq fv (float-vector 0.1 0.2 0.3 0.5 0.7))(dv-test (length fv) fv)(exit 0))'"))
   (assert (string= (read-line f) "size = 5"))
   (assert (string= (read-line f) "0: 1.000000e-01 3FB9999999999998"))
   (assert (string= (read-line f) "1: 2.000000e-01 3FC9999999999998"))
@@ -174,7 +174,7 @@ test-testd = 1.23456
   (format t "~%str-test(exec in eus)~%")
   (str-test (length str) str)
   ;;
-  (setq f (piped-fork "irteusgl eus64-module.l '(progn (setq str \"input : test64 string\")(str-test (length str) str)(exit 0))'"))
+  (setq f (piped-fork "eusg test-foreign-module.l '(progn (setq str \"input : test64 string\")(str-test (length str) str)(exit 0))'"))
   (assert (string= (read-line f) (format nil "size = ~d" (length str))))
   (dotimes (i (length str))
     (assert (string= (read-line f) (format nil "~d: ~c ~x" i (elt str i) (elt str i))))

contrib/eus64-check/eus64-test.l renamed to test/test-foreign.l

@@ -1,6 +1,7 @@
 #include <stdio.h>
 #include <unistd.h>
 
+extern "C" {
 int float_test(int n, float f1, float f2, float f3, float f4) {
   unsigned int ui;
 
@@ -90,7 +91,7 @@ int int_test(long l, int i, short s) {
   printf("long  = %ld(%lX)\n",l,l);
   printf("int   = %d(%X)\n",i,i);
   printf("short = %d(%X)\n",s,s);
-  
+
   return l + i + s;
 }
 
@@ -119,7 +120,7 @@ long ret_long(long a, long b) {
 }
 
 double test_testd(long i0, long i1, long i2,
-                  long i3, long i4, long i5, 
+                  long i3, long i4, long i5,
                   double d0, double d1, double d2, double d3,
                   double d4, double d5, double d6, double d7,
                   double d8, double d9,
@@ -132,12 +133,12 @@ double test_testd(long i0, long i1, long i2,
   printf("%lf %lf %lf %lf\n", d4, d5, d6, d7);
   printf("%lf %lf\n", d8, d9);
   printf("%ld %ld\n", i6, i7);
-  
+
   //return 0x1234;
   return 1.23456;
 }
 double test_testd2(long i0, long i1, long i2,
-                   long i3, long i4, long i5, 
+                   long i3, long i4, long i5,
                    double d0, double d1, double d2, double d3,
                    double d4, double d5, double d6, double d7,
                    double d8, double d9, double d10,
@@ -150,14 +151,14 @@ double test_testd2(long i0, long i1, long i2,
   printf("%lf %lf %lf %lf\n", d4, d5, d6, d7);
   printf("%lf %lf %lf\n", d8, d9, d10);
   printf("%ld %ld\n", i6, i7);
-  
+
   //return 0x1234;
   return 1.23456;
 }
 
 static long (*g)();
 static double (*gf) (long i0, long i1, long i2,
-                     long i3, long i4, long i5, 
+                     long i3, long i4, long i5,
                      double d0, double d1, double d2, double d3,
                      double d4, double d5, double d6, double d7,
                      double d8, double d9,
@@ -172,7 +173,7 @@ long set_ifunc(long (*f) ())
 long set_ffunc(double (*f) ())
 {
   gf = (double (*) (long i0, long i1, long i2,
-                    long i3, long i4, long i5, 
+                    long i3, long i4, long i5,
                     double d0, double d1, double d2, double d3,
                     double d4, double d5, double d6, double d7,
                     double d8, double d9,
@@ -214,3 +215,4 @@ long get_size_of_long() {
 long get_size_of_int() {
   return (sizeof(int));
 }
+}