[MLton-commit] r6863

[Wesley Terpstra]

Library regression passes on amd64-linux.


----------------------------------------------------------------------

U   mlton/trunk/regression/library/check.sml
U   mlton/trunk/regression/library/lib2.sml
U   mlton/trunk/regression/library/lib3.sml
U   mlton/trunk/regression/library/lib4.sml
U   mlton/trunk/regression/library/lib5.sml
U   mlton/trunk/regression/library/library-test

----------------------------------------------------------------------

Modified: mlton/trunk/regression/library/check.sml
===================================================================
--- mlton/trunk/regression/library/check.sml	2008-09-18 03:13:09 UTC (rev 6862)
+++ mlton/trunk/regression/library/check.sml	2008-09-18 03:50:18 UTC (rev 6863)
@@ -1,8 +1,8 @@
 (* Prepare lib5 *)
-val () = _import "lib5_open" public : unit -> unit; ()
+val () = _import "lib5_open" public : int * string vector -> unit; 
+         (1, Vector.fromList ["lib5"])
 
 type p = MLton.Pointer.t
-
 type 'a s = (unit -> 'a) * ('a -> unit)
 val (_, setSI) = _symbol "checksmlSymPrivate" alloc private : p s;
 val (_, setSB) = _symbol "checksmlSymPublic"  alloc public  : p s;

Modified: mlton/trunk/regression/library/lib2.sml
===================================================================
--- mlton/trunk/regression/library/lib2.sml	2008-09-18 03:13:09 UTC (rev 6862)
+++ mlton/trunk/regression/library/lib2.sml	2008-09-18 03:50:18 UTC (rev 6863)
@@ -1,8 +1,8 @@
 (* Prepare lib1 *)
-val () = _import "lib1_open" public : unit -> unit; ()
+val () = _import "lib1_open" public : int * string vector -> unit; 
+         (1, Vector.fromList ["lib1"])
 
 type p = MLton.Pointer.t
-
 type 'a s = (unit -> 'a) * ('a -> unit)
 val (_, setSI) = _symbol "lib2smlSymPrivate" alloc private : p s;
 val (_, setSB) = _symbol "lib2smlSymPublic"  alloc public  : p s;

Modified: mlton/trunk/regression/library/lib3.sml
===================================================================
--- mlton/trunk/regression/library/lib3.sml	2008-09-18 03:13:09 UTC (rev 6862)
+++ mlton/trunk/regression/library/lib3.sml	2008-09-18 03:50:18 UTC (rev 6863)
@@ -1,8 +1,8 @@
 (* Prepare lib2 *)
-val () = _import "lib2_open" external : unit -> unit; ()
+val () = _import "lib2_open" external : int * string vector -> unit; 
+         (1, Vector.fromList ["lib2"])
 
 type p = MLton.Pointer.t
-
 type 'a s = (unit -> 'a) * ('a -> unit)
 val (_, setSI) = _symbol "lib3smlSymPrivate" alloc private : p s;
 val (_, setSB) = _symbol "lib3smlSymPublic"  alloc public  : p s;

Modified: mlton/trunk/regression/library/lib4.sml
===================================================================
--- mlton/trunk/regression/library/lib4.sml	2008-09-18 03:13:09 UTC (rev 6862)
+++ mlton/trunk/regression/library/lib4.sml	2008-09-18 03:50:18 UTC (rev 6863)
@@ -1,8 +1,8 @@
 (* Prepare lib3 *)
-val () = _import "lib3_open" public : unit -> unit; ()
+val () = _import "lib3_open" public : int * string vector -> unit; 
+         (1, Vector.fromList ["lib3"])
 
 type p = MLton.Pointer.t
-
 type 'a s = (unit -> 'a) * ('a -> unit)
 val (_, setSI) = _symbol "lib4smlSymPrivate" alloc private : p s;
 val (_, setSB) = _symbol "lib4smlSymPublic"  alloc public  : p s;

Modified: mlton/trunk/regression/library/lib5.sml
===================================================================
--- mlton/trunk/regression/library/lib5.sml	2008-09-18 03:13:09 UTC (rev 6862)
+++ mlton/trunk/regression/library/lib5.sml	2008-09-18 03:50:18 UTC (rev 6863)
@@ -1,8 +1,8 @@
 (* Prepare lib4 *)
-val () = _import "lib4_open" external : unit -> unit; ()
+val () = _import "lib4_open" external : int * string vector -> unit; 
+         (1, Vector.fromList ["lib4"])
 
 type p = MLton.Pointer.t
-
 type 'a s = (unit -> 'a) * ('a -> unit)
 val (_, setSI) = _symbol "lib5smlSymPrivate" alloc private : p s;
 val (_, setSB) = _symbol "lib5smlSymPublic"  alloc public  : p s;

Modified: mlton/trunk/regression/library/library-test
===================================================================
--- mlton/trunk/regression/library/library-test	2008-09-18 03:13:09 UTC (rev 6862)
+++ mlton/trunk/regression/library/library-test	2008-09-18 03:50:18 UTC (rev 6863)
@@ -1,6 +1,6 @@
 #! /usr/bin/env bash
 
-ML=mlton
+ML=../../build/bin/mlton
 
 O[0]='-default-ann'
 O[1]='allowFFI true'
@@ -8,8 +8,14 @@
 O[3]='-L.'
 O[4]='-target'
 O[5]='x86_64'
+O[6]='-debug'
+O[7]='true'
 
 LIB="-link-opt -l"
+
+# Enable finding libraries locally
+export LD_LIBRARY_PATH=.
+
 set -ex
 
 # Compile DSO #1
@@ -25,5 +31,4 @@
 $ML "${O[@]}" ${LIB}4 ${LIB}5 -format executable -export-header check.h check.sml check.c
 
 # Check that symbols resolved correctly
-export LD_LIBRARY_PATH=.
 ./check