Merge pull request #2674 from BuckleScript/fix_2672

fix #2672

Author: bobzhang

.travis.yml

@@ -8,12 +8,15 @@ env:
   - BS_TRAVIS_CI=1
 node_js:
   - 6
-script: npm run coveralls
+
+# script: npm run coveralls
+# if we turn on this script, we should make
+# sure `npm test` is executed
 #
 # - 6
 # This delays notification
 
-# Not a very reliable service..  
+# Not a very reliable service..
 
 # FIXME: instrumentation takes too much time
 

jscomp/bin/all_ounit_tests.ml

@@ -3913,153 +3913,153 @@ let (=~) = OUnit.assert_equal
 
 
 (* let output_of_exec_command command args =
-    let readme, writeme = Unix.pipe () in 
-    let pid = Unix.create_process command args Unix.stdin writeme Unix.stderr in 
+    let readme, writeme = Unix.pipe () in
+    let pid = Unix.create_process command args Unix.stdin writeme Unix.stderr in
     let in_chan = Unix.in_channel_of_descr readme *)
 
 
 
 let perform_bsc = Ounit_cmd_util.perform_bsc
-let bsc_check_eval = Ounit_cmd_util.bsc_check_eval 
+let bsc_check_eval = Ounit_cmd_util.bsc_check_eval
 
 
-let suites = 
+let suites =
   __FILE__
   >::: [
-    __LOC__ >:: begin fun _ -> 
-      let v_output = perform_bsc  [| "-v" |] in 
+    __LOC__ >:: begin fun _ ->
+      let v_output = perform_bsc  [| "-v" |] in
       OUnit.assert_bool __LOC__ ((perform_bsc [| "-h" |]).exit_code  <> 0  );
       OUnit.assert_bool __LOC__ (v_output.exit_code = 0);
       (* Printf.printf "\n*>%s" v_output.stdout; *)
       (* Printf.printf "\n*>%s" v_output.stderr ; *)
-    end; 
-    __LOC__ >:: begin fun _ -> 
-      let v_output = 
-        perform_bsc  [| "-bs-eval"; {|let str = "'a'" |}|] in 
+    end;
+    __LOC__ >:: begin fun _ ->
+      let v_output =
+        perform_bsc  [| "-bs-eval"; {|let str = "'a'" |}|] in
       OUnit.assert_bool __LOC__ (v_output.exit_code = 0)
     end;
-    __LOC__ >:: begin fun _ -> 
-      let should_be_warning = 
-        bsc_check_eval  {|let bla4 foo x y= foo##(method1 x y [@bs]) |} in 
+    __LOC__ >:: begin fun _ ->
+      let should_be_warning =
+        bsc_check_eval  {|let bla4 foo x y= foo##(method1 x y [@bs]) |} in
       (* debug_output should_be_warning; *)
       OUnit.assert_bool __LOC__ (Ext_string.contain_substring
                                    should_be_warning.stderr "Unused")
     end;
-     __LOC__ >:: begin fun _ ->    
-      let should_be_warning = 
-        bsc_check_eval  {| external mk : int -> ([`a|`b [@bs.string]]) = "" [@@bs.val] |} in 
-        OUnit.assert_bool __LOC__ 
+     __LOC__ >:: begin fun _ ->
+      let should_be_warning =
+        bsc_check_eval  {| external mk : int -> ([`a|`b [@bs.string]]) = "" [@@bs.val] |} in
+        OUnit.assert_bool __LOC__
         (Ext_string.contain_substring
                                    should_be_warning.stderr "Unused")
      end;
-    __LOC__ >:: begin fun _ -> 
+    __LOC__ >:: begin fun _ ->
       let should_err = bsc_check_eval {|
-external ff : 
-    resp -> (_ [@bs.as "x"]) -> int -> unit = 
-    "x" [@@bs.set]      
-      |} in 
-      OUnit.assert_bool __LOC__ 
+external ff :
+    resp -> (_ [@bs.as "x"]) -> int -> unit =
+    "x" [@@bs.set]
+      |} in
+      OUnit.assert_bool __LOC__
         (Ext_string.contain_substring should_err.stderr
            "Ill defined"
         )
     end;
 
-    __LOC__ >:: begin fun _ -> 
-      (** used in return value 
-          This should fail, we did not 
+    __LOC__ >:: begin fun _ ->
+      (** used in return value
+          This should fail, we did not
           support uncurry return value yet
       *)
       let should_err = bsc_check_eval {|
     external v3 :
     int -> int -> (int -> int -> int [@bs.uncurry])
     = ""[@@bs.val]
 
-    |} in 
+    |} in
       (* Ounit_cmd_util.debug_output should_err;*)
       OUnit.assert_bool __LOC__
-        (Ext_string.contain_substring 
+        (Ext_string.contain_substring
            should_err.stderr "bs.uncurry")
     end ;
 
-    __LOC__ >:: begin fun _ -> 
+    __LOC__ >:: begin fun _ ->
       let should_err = bsc_check_eval {|
-    external v4 :  
+    external v4 :
     (int -> int -> int [@bs.uncurry]) = ""
     [@@bs.val]
 
-    |} in 
+    |} in
       (* Ounit_cmd_util.debug_output should_err ; *)
       OUnit.assert_bool __LOC__
-        (Ext_string.contain_substring 
+        (Ext_string.contain_substring
            should_err.stderr "bs.uncurry")
     end ;
 
-    __LOC__ >:: begin fun _ -> 
+    __LOC__ >:: begin fun _ ->
       let should_err = bsc_check_eval {|
       {js| \uFFF|js}
-      |} in 
+      |} in
       OUnit.assert_bool __LOC__ (not @@ Ext_string.is_empty should_err.stderr)
     end;
 
-    __LOC__ >:: begin fun _ -> 
+    __LOC__ >:: begin fun _ ->
       let should_err = bsc_check_eval {|
       external mk : int -> ([`a|`b] [@bs.string]) = "" [@@bs.val]
-      |} in 
+      |} in
       OUnit.assert_bool __LOC__ (not @@ Ext_string.is_empty should_err.stderr)
     end;
 
-    __LOC__ >:: begin fun _ -> 
+    __LOC__ >:: begin fun _ ->
       let should_err = bsc_check_eval {|
       external mk : int -> ([`a|`b] ) = "" [@@bs.val]
-      |} in 
+      |} in
       OUnit.assert_bool __LOC__ ( Ext_string.is_empty should_err.stderr)
-      (* give a warning or ? 
-         ( [`a | `b ] [@bs.string] ) 
+      (* give a warning or ?
+         ( [`a | `b ] [@bs.string] )
          (* auto-convert to ocaml poly-variant *)
       *)
     end;
 
-    __LOC__ >:: begin fun _ -> 
+    __LOC__ >:: begin fun _ ->
       let should_err = bsc_check_eval {|
-      type t 
+      type t
       external mk : int -> (_ [@bs.as {json| { x : 3 } |json}]) ->  t = "" [@@bs.val]
-      |} in 
+      |} in
       OUnit.assert_bool __LOC__ (Ext_string.contain_substring should_err.stderr "Invalid json literal")
     end
     ;
-    __LOC__ >:: begin fun _ -> 
+    __LOC__ >:: begin fun _ ->
       let should_err = bsc_check_eval {|
-      type t 
+      type t
       external mk : int -> (_ [@bs.as {json| { "x" : 3 } |json}]) ->  t = "" [@@bs.val]
-      |} in 
+      |} in
       OUnit.assert_bool __LOC__ (Ext_string.is_empty should_err.stderr)
     end
     ;
     (* #1510 *)
-    __LOC__ >:: begin fun _ -> 
+    __LOC__ >:: begin fun _ ->
       let should_err = bsc_check_eval {|
-       let should_fail = fun [@bs.this] (Some x) y u -> y + u 
-      |} in 
-      OUnit.assert_bool __LOC__ 
+       let should_fail = fun [@bs.this] (Some x) y u -> y + u
+      |} in
+      OUnit.assert_bool __LOC__
         (Ext_string.contain_substring  should_err.stderr "simple")
     end;
 
-    __LOC__ >:: begin fun _ -> 
+    __LOC__ >:: begin fun _ ->
       let should_err = bsc_check_eval {|
-       let should_fail = fun [@bs.this] (Some x as v) y u -> y + u 
-      |} in 
+       let should_fail = fun [@bs.this] (Some x as v) y u -> y + u
+      |} in
       (* Ounit_cmd_util.debug_output should_err; *)
-      OUnit.assert_bool __LOC__ 
+      OUnit.assert_bool __LOC__
         (Ext_string.contain_substring  should_err.stderr "simple")
     end;
 
-    __LOC__ >:: begin fun _ -> 
+    (* __LOC__ >:: begin fun _ ->
       let should_err = bsc_check_eval {|
      external f : string -> unit -> unit = "x.y" [@@bs.send]
-     |} in 
-      OUnit.assert_bool __LOC__ 
+     |} in
+      OUnit.assert_bool __LOC__
         (Ext_string.contain_substring should_err.stderr "Not a valid method name")
-    end;
+    end; *)
 
 
 
@@ -4103,50 +4103,50 @@ external ff :
         (not (Ext_string.is_empty should_err.stderr))
 
     end;
-    __LOC__ >:: begin fun _ -> 
+    __LOC__ >:: begin fun _ ->
     let should_err = bsc_check_eval {|
     external foo_bar :
     (_ [@bs.as "foo"]) ->
     string ->
     string = "bar"
   [@@bs.send]
-    |} in 
-    OUnit.assert_bool __LOC__ 
+    |} in
+    OUnit.assert_bool __LOC__
     (Ext_string.contain_substring should_err.stderr "Ill defined attribute")
   end;
-    __LOC__ >:: begin fun _ -> 
+    __LOC__ >:: begin fun _ ->
     let should_err = bsc_check_eval {|
       let bla4 foo x y = foo##(method1 x y [@bs])
-    |} in 
+    |} in
     (* Ounit_cmd_util.debug_output should_err ;  *)
-    OUnit.assert_bool __LOC__ 
+    OUnit.assert_bool __LOC__
     (Ext_string.contain_substring should_err.stderr
     "Unused")
   end;
-    __LOC__ >:: begin fun _ -> 
+    __LOC__ >:: begin fun _ ->
     let should_err = bsc_check_eval {|
-    external mk : int -> 
+    external mk : int ->
   (
-    [`a|`b] 
-     [@bs.string] 
-  ) = "" [@@bs.val]       
-    |} in 
+    [`a|`b]
+     [@bs.string]
+  ) = "" [@@bs.val]
+    |} in
     (* Ounit_cmd_util.debug_output should_err ;  *)
-    OUnit.assert_bool __LOC__ 
+    OUnit.assert_bool __LOC__
     (Ext_string.contain_substring should_err.stderr
     "Unused")
   end;
-  __LOC__ >:: begin fun _ -> 
+  __LOC__ >:: begin fun _ ->
     let should_err = bsc_check_eval {|
     type -'a t = {k : 'a } [@@bs.deriving abstract]
-    |} in 
+    |} in
     OUnit.assert_bool __LOC__
     (Ext_string.contain_substring should_err.stderr "contravariant")
   end;
-  __LOC__ >:: begin fun _ -> 
+  __LOC__ >:: begin fun _ ->
     let should_err = bsc_check_eval {|
     type 'a t = {k : int -> 'a } [@@bs.deriving abstract]
-    |} in 
+    |} in
     OUnit.assert_bool __LOC__
     (Ext_string.contain_substring should_err.stderr "not allowed")
   end