Skip to content

Commit 27f645f

Browse files
committed
rename test-foreign-module.l to test-foreign.module_l, not to capture by test/*.l at test.sh
1 parent d71b83a commit 27f645f

File tree

2 files changed

+14
-11
lines changed

2 files changed

+14
-11
lines changed

test/test-foreign.l

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
(load "test-foreign-module.l")
1+
(eval-when (load eval) (load "test-foreign.module_l"))
22
(require :unittest "lib/llib/unittest.l")
33

44
(init-unit-test)
@@ -50,7 +50,7 @@ test-testd = 1.23456
5050
(assert (eps= 1.23456 ret))
5151

5252
;;
53-
(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))'"))
53+
(setq f (piped-fork (format nil "eusg ~A/test/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))'" *eusdir*)))
5454
(assert (string= (read-line f) "100 101 102"))
5555
(assert (string= (read-line f) "103 104 105"))
5656
(assert (string= (read-line f) "1000.000000 1010.000000 1020.000000 1030.000000"))
@@ -74,7 +74,7 @@ test-testd = 1.23456
7474
(float3-test 0 0.1 0.2 0.3 0.4)
7575

7676
;;
77-
(setq f (piped-fork "eusg test-foreign-module.l '(progn (float-test 0 0.1 0.2 0.3 0.4)(exit 0))'"))
77+
(setq f (piped-fork (format nil "eusg ~A/test/test-foreign.module_l '(progn (float-test 0 0.1 0.2 0.3 0.4)(exit 0))'" *eusdir*)))
7878
(assert (eps= (read-from-string (subseq (read-line f) 2)) 0.1)) ;; skip first 2 character
7979
(assert (eps= (read-from-string (subseq (read-line f) 2)) 0.2))
8080
(assert (eps= (read-from-string (subseq (read-line f) 2)) 0.3))
@@ -96,12 +96,12 @@ test-testd = 1.23456
9696
(double3-test 1 0.1 0.2 0.3 0.4)
9797

9898
;;
99-
(setq f (piped-fork "eusg test-foreign-module.l '(progn (double-test 1 0.1 0.2 0.3 0.4)(exit 0))'"))
99+
(setq f (piped-fork (format nil "eusg ~A/test/test-foreign.module_l '(progn (double-test 1 0.1 0.2 0.3 0.4)(exit 0))'" *eusdir*)))
100100
(assert (eps= (read-from-string (subseq (read-line f) 2)) 0.1)) ;; skip first 2 character
101101
(assert (eps= (read-from-string (subseq (read-line f) 2)) 0.2))
102102
(assert (eps= (read-from-string (subseq (read-line f) 2)) 0.3))
103103
(assert (eps= (read-from-string (subseq (read-line f) 2)) 0.4))
104-
(setq f (piped-fork "eusg test-foreign-module.l '(progn (double3-test 1 0.1 0.2 0.3 0.4)(exit 0))'"))
104+
(setq f (piped-fork (format nil "eusg ~A/test/test-foreign.module_l '(progn (double3-test 1 0.1 0.2 0.3 0.4)(exit 0))'" *eusdir*)))
105105
(assert (eps= (read-from-string (subseq (read-line f) 2)) 0.1)) ;; skip first 2 character
106106
(assert (eps= (read-from-string (subseq (read-line f) 2)) 0.2))
107107
(assert (eps= (read-from-string (subseq (read-line f) 2)) 0.3))
@@ -128,7 +128,7 @@ test-testd = 1.23456
128128
(lv-test (length iv) iv)
129129

130130
;;
131-
(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))'"))
131+
(setq f (piped-fork (format nil "eusg ~A/test/test-foreign.module_l '(progn (setq iv (integer-vector 0 100 10000 1000000 100000000 10000000000))(lv-test (length iv) iv)(exit 0))'" *eusdir*)))
132132
(assert (string= (read-line f) "size = 6"))
133133
(assert (string= (read-line f) "0: 0 0"))
134134
(assert (string= (read-line f) "1: 100 64"))
@@ -157,7 +157,7 @@ test-testd = 1.23456
157157
(dv-test (length fv) fv)
158158

159159
;;
160-
(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))'"))
160+
(setq f (piped-fork (format nil "eusg ~A/test/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))'" *eusdir*)))
161161
(assert (string= (read-line f) "size = 5"))
162162
(assert (string= (read-line f) "0: 1.000000e-01 3FB9999999999998"))
163163
(assert (string= (read-line f) "1: 2.000000e-01 3FC9999999999998"))
@@ -174,7 +174,7 @@ test-testd = 1.23456
174174
(format t "~%str-test(exec in eus)~%")
175175
(str-test (length str) str)
176176
;;
177-
(setq f (piped-fork "eusg test-foreign-module.l '(progn (setq str \"input : test64 string\")(str-test (length str) str)(exit 0))'"))
177+
(setq f (piped-fork (format nil "eusg ~A/test/test-foreign.module_l '(progn (setq str \"input : test64 string\")(str-test (length str) str)(exit 0))'" *eusdir*)))
178178
(assert (string= (read-line f) (format nil "size = ~d" (length str))))
179179
(dotimes (i (length str))
180180
(assert (string= (read-line f) (format nil "~d: ~c ~x" i (elt str i) (elt str i))))
@@ -245,5 +245,6 @@ test-testd = 1.23456
245245
(format t "call-ffunc = ~A~%" (call-ffunc))
246246
|#
247247

248-
(run-all-tests)
249-
(exit)
248+
(eval-when (load eval)
249+
(run-all-tests)
250+
(exit))

test/test-foreign-module.l renamed to test/test-foreign.module_l

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
(unless (boundp '*testmod*)
22
(setq *testmod* (load-foreign "test_foreign.so"))
33
(defforeign float-test *testmod* "float_test" (:integer :float32 :float32 :float32 :float32) :integer)
4+
(defforeign float1-test *testmod* "float_test" (:integer :float :float :float :float) :integer)
45
(defforeign float2-test *testmod* "float_test" (:integer :double :double :double :double) :integer)
5-
(defforeign float3-test *testmod* "float_test" () :integer)
6+
(defforeign float3-test *testmod* "float_test" () :float)
67
(defforeign double-test *testmod* "double_test" (:integer :double :double :double :double) :integer)
8+
(defforeign double1-test *testmod* "double_test" (:integer :float :float :float :float) :integer)
79
(defforeign double2-test *testmod* "double_test" (:integer :float32 :float32 :float32 :float32) :integer)
810
(defforeign double3-test *testmod* "double_test" () :integer)
911
(defforeign iv-test *testmod* "iv_test" () :integer)

0 commit comments

Comments
 (0)