tweak

Author: bobzhang

jscomp/Makefile.shared

@@ -3,7 +3,7 @@ CAMLDEP=ocamldep.opt
 CAMLLEX=ocamllex.opt
 CAMLOPT=ocamlopt.opt
 STDLIB=stdlib-402
-
+# STDLIB=stdlib-406
 
 
 .SUFFIXES: .mli .ml .cmi .cmo .cmx .p.cmx .cmj .js

jscomp/stdlib-402/Makefile.shared

@@ -33,7 +33,7 @@ include ../Makefile.shared
 
 BS_FLAGS= $(BS_COMMON_FLAGS) $(BS_PKG_FLAGS) 
 COMPFLAGS= $(BS_FLAGS) -strict-sequence -w +33..39-102 -g  -nostdlib \
-          -safe-string -I ../runtime -I ../others $(PROD_BS_FLAGS)
+          -safe-string -I ../runtime -I ../others 
 
 
 # OPTCOMPILER=ocamlopt.opt

jscomp/test/Makefile

@@ -134,7 +134,6 @@ OTHERS := test_literals a test_ari test_export2 test_internalOO test_obj_simple_
 	switch_case_test\
 	bb\
 	ocaml_parsetree_test\
-	ocaml_typedtree_test\
 	gpr_1484\
 	gpr_1481\
 	custom_error_test\
@@ -267,6 +266,8 @@ OTHERS := test_literals a test_ari test_export2 test_internalOO test_obj_simple_
 	large_record_duplication_test\
 	unboxed_attribute_test\
 	406_primitive_test\
+	ocaml_typedtree_test
+# ocaml_typedtree_test is not cross version due to camlinternalFormat
 # bs_uncurry_test
 # needs Lam to get rid of Uncurry arity first
 # simple_derive_test

jscomp/test/rebind_module.js

@@ -4,5 +4,8 @@ var Caml_exceptions = require("../../lib/js/caml_exceptions.js");
 
 var A = Caml_exceptions.create("Rebind_module.A");
 
+var AA = Caml_exceptions.create("Rebind_module.AA");
+
 exports.A = A;
+exports.AA = AA;
 /* No side effect */

jscomp/test/rebind_module.ml

@@ -8,8 +8,7 @@ type a += A
    it seems record disamibigution does not 
    work with extensible type
 *)
-#if OCAML_VERSION =~ "<4.03.0" then
-type b += A 
-#else
+
 type b += AA (*name must be unique since 4.06 *)
-#end
+
+(*TODO: more tests for Local module A *)

jscomp/test/rebind_module_test.js

@@ -3,7 +3,7 @@
 var Rebind_module = require("./rebind_module.js");
 
 function x(v) {
-  if (v === Rebind_module.A) {
+  if (v === Rebind_module.AA) {
     return 0;
   } else {
     return 1;

jscomp/test/rebind_module_test.ml

@@ -1,4 +1,4 @@
 let x (v : Rebind_module.b) =
   match v with
-  | Rebind_module.A -> 0 
+  | Rebind_module.AA -> 0 
   | _ -> 1