tests

Author: bobzhang

Diff for: scripts/config_compiler.js

@@ -1,4 +1,3 @@
-// Generated by BUCKLESCRIPT VERSION 1.8.1, PLEASE EDIT WITH CARE
 'use strict';
 
 var Fs                      = require("fs");
@@ -159,7 +158,7 @@ if (match$1) {
     Process.exit(2);
   }
 } else {
-  console.log("System-installed OCaml compiler version not found\nBuilding and installing local compiler");
+  console.log("System-installed OCaml compiler version not found");
   Process.exit(2);
 }
 

Diff for: scripts/config_compiler.ml

@@ -153,7 +153,7 @@ let () =
         config_map is_windows
     else Process.exit 2
   | None ->
-    (Js.log("System-installed OCaml compiler version not found\nBuilding and installing local compiler");
+    (Js.log("System-installed OCaml compiler version not found");
      Process.exit 2)
 
 

Diff for: scripts/install.js

@@ -88,6 +88,7 @@ function non_windows_npm_release() {
     try {
         child_process.execSync('node ../scripts/config_compiler.js', working_config)
     } catch (e) {
+        console.log('Build a local version of OCaml compiler, it may take a couple of minutes')
         child_process.execSync(path.join(__dirname, 'buildocaml.sh')) // TODO: sh -c ? this will be wrong if we have white space in the path
         console.log('configure again with local ocaml installed')
         child_process.execSync('node ../scripts/config_compiler.js', working_config)

Diff for: test.go

@@ -167,34 +167,36 @@ func main() {
 	// 	// makeCommand("make", "-C", filepath.Join("jscomp","test")),
 	// })
 
-	cmd:=cmd ("make", "-C", "jscomp","travis-world-test")
-	cmd.Stdout = os.Stdout
-	cmd.Stderr = os.Stderr
-	error:= cmd.Run()
-	if error!= nil {
-		
+	make:=cmd ("make", "-C", "jscomp","travis-world-test")
+	make.Stdout = os.Stdout
+	make.Stderr = os.Stderr
+	error:= make.Run()
+	if error!= nil {		
 		os.Exit(2)
 	}
 
+	ginstall := cmd("npm", "i", "-g", ".")
+	fmt.Println("install bucklescript globally")
+	error = ginstall.Run()
+	if error != nil {
+		log.Fatalf("install failed")
+	} else {
+		fmt.Println("install finished")
+	}
+	bsbDir, _ := cmd("bsb", "-where").CombinedOutput ()
+	fmt.Println("BSBDIR:", string(bsbDir))
+	bsb, _ := cmd("ls", "-al", filepath.Dir( string (bsbDir))).CombinedOutput()
+	fmt.Println("BSB isntallation:", string(bsb ))
+
 
-	// bsbDir, _ := cmd("bsb", "-where").CombinedOutput ()
-	// fmt.Println("BSBDIR:", string(bsbDir))
-	// bsb, _ := cmd("ls", "-al", filepath.Dir( string (bsbDir))).CombinedOutput()
-	// fmt.Println("BSB isntallation:", string(bsb ))
-
-	// wg.Add(2)
-	// runMoCha(&wg)
-	// go installGlobal(&wg)
-	// wg.Wait()
-	
-	// var wg sync.WaitGroup
-	// for _, theme := range []string{"basic", "basic-reason", "generator", "minimal"} {
-	// 	fmt.Println("Test theme", theme)
-	// 	wg.Add(1)
-	// 	go (func(theme string) {
-	// 		defer wg.Done()
-	// 		testTheme(theme)
-	// 	})(theme)
-	// }
-	// wg.Wait()
+	var wg sync.WaitGroup
+	for _, theme := range []string{"basic", "basic-reason", "generator", "minimal"} {
+		fmt.Println("Test theme", theme)
+		wg.Add(1)
+		go (func(theme string) {
+			defer wg.Done()
+			testTheme(theme)
+		})(theme)
+	}
+	wg.Wait()
 }