Merge pull request #419 from k-okada/test_arm_load

add test to check load-module-object-file of LOAD-MODULE class

Author: k-okada

lisp/c/eus.c

@@ -756,14 +756,31 @@ static void initclasses()
   C_FCODE=speval(FCODE);
 /*15*/
 #if (WORD_SIZE == 64)
-  CLOSURE=basicclass("CLOSURE",C_CODE,&closurecp,3,"ENV0","ENV1","ENV2");
+  CLOSURE=basicclass("CLOSURE",C_CODE,&closurecp,
+#if ARM // ARM uses entry2 in struct closure in eus.h
+		     4,"ENTRY2",
 #else
-  CLOSURE=basicclass("CLOSURE",C_CODE,&closurecp,2,"ENV1","ENV2");
+		     3,
+#endif
+		     "ENV0","ENV1","ENV2");
+#else
+  CLOSURE=basicclass("CLOSURE",C_CODE,&closurecp,
+#if ARM // ARM uses entry2 in struct closure in eus.h
+		     3,"ENTRY2",
+#else
+		     2,
+#endif
+		     "ENV1","ENV2");
 #endif
   C_CLOSURE=speval(CLOSURE);
 /* 16    ---new for Solaris */
-  LDMODULE=basicclass("LOAD-MODULE",C_CODE, &ldmodulecp, 3,
-			"SYMBOL-TABLE","OBJECT-FILE", "HANDLE");
+  LDMODULE=basicclass("LOAD-MODULE",C_CODE, &ldmodulecp,
+#if ARM // ARM uses entry2 in struct ldmodule in eus.h
+		      4,"ENTRY2",
+#else
+		      3,
+#endif
+		      "SYMBOL-TABLE","OBJECT-FILE", "HANDLE");
   C_LDMOD=speval(LDMODULE);
 /*17*/
   LABREF=basicclass("LABEL-REFERENCE",C_OBJECT,&labrefcp,4,

test/loader.l

@@ -0,0 +1,36 @@
+(require :unittest "lib/llib/unittest.l")
+
+(init-unit-test)
+
+;; check because ldmodule have #if ARM for objname, handle
+(deftest test-load
+  (let ((libpath (format nil "~A/~A/lib/libeusgeo.so" *eusdir*
+                         (cond ((member :solaris2 *features*)  "SunOS5")
+                               ((member :irix *features*) "IRIX")
+                               ((member :irix6 *features*) "IRIX6")
+                               ((member :darwin *features*) "Darwin")
+                               ((member :sh4 *features*) "LinuxSH4")
+                               ((member :linux *features*)
+                                (cond
+                                 ((member :x86_64 *features*)
+                                  "Linux64")
+                                 ((member :arm *features*)
+                                  "LinuxARM")
+                                 (t "Linux")))
+                               ((member :SunOS4.1 *features*) "SunOS4")
+                               ((member :Windows *features*) "Windows")
+                               ((member :Windows95 *features*) "Win95")
+                               ((member :WindowsNT *features*) "WinNT")
+                               ((member :alpha *features*) "Alpha")
+                               ((member :cygwin *features*) "Cygwin"))))
+        libmod)
+    (format *error-output* "loading ~A~%" libpath)
+    (setq libmod (load libpath :entry nil))
+    (format *error-output* "loaded ~A, object-file ~A~%" libmod (load-module-object-file libmod))
+    (assert (equal (pathname (load-module-object-file libmod)) (pathname libpath)) (format nil "object-file path ~A ~A" (load-module-object-file libmod) libpath))
+    ))
+
+;; cehck because closure have #if ARM for euv0, euv1, euv2
+(eval-when (load eval)
+  (run-all-tests)
+  (exit))