ci: only v2 tests, more debug output

Only tests that are passing on V2 are currently
enabled for every PR.

Signed-off-by: Alexander Bezzubov <[email protected]>

Author: bzz

.travis.yml

@@ -23,6 +23,7 @@ jobs:
   include:
     - name: 'All tests'
       stage: test
+      if: tag IS present # TODO(bzz): enable on PRs as soon as migrated to V2
       install: &test_setup_anchor
         - docker run --privileged -d -p 9432:9432 --name bblfsh bblfsh/bblfshd
         - docker exec -it bblfsh bblfshctl driver install --recommended
@@ -36,6 +37,7 @@ jobs:
     - name: 'V2: passing tests' # TODO(#83): remove, after both tests sets converge
       install: *test_setup_anchor
       script:
+        - sudo apt-get install -y binutils
         - ./sbt assembly
         - ./sbt "testOnly *Close* *ClientVersion* *SupportedLanguages*"
         - ./sbt "testOnly org.bblfsh.client.v2.BblfshClientParseTest -- -z \"Decoded UAST after parsing\""

build.sbt

@@ -127,6 +127,12 @@ getLibuast := {
     "rm src/main/resources/libuast/libuast.so" #&& // always a static build
     "rm libuast-bin.tar.gz" !
 
+    "find src/main/resources"!
+
+    "nm src/main/resources/libuast/libuast.a" #| "grep -c UastDecode"!
+
+    "nm src/main/resources/libuast/libuast.a" #| "wc -l"!
+
     println("Done unpacking libuast")
 }
 
@@ -154,16 +160,15 @@ def compileUnix(sourceFiles: String) = {
   }
 
   val osName = System.getProperty("os.name").toLowerCase()
-  if (osName.contains("mac os x")) { // TODO(bzz): change to '-fPIC -O2' for release
+  if (osName.contains("mac os x")) { // TODO(bzz): change back to '-fPIC -O2' for release
     val cmd:String = "g++ -shared -Wall -g -std=c++11 " +
       "-I/usr/include " +
       "-I" + javaHome + "/include/ " +
       "-I" + javaHome + "/include/darwin " +
       "-Isrc/main/resources/libuast " +
-      "-Lsrc/main/resources/libuast " + // sic, must be in the classpath for the test
-      "-l uast " +
-      "-o src/main/resources/lib/libscalauast.dylib " +
-      sourceFiles + " "
+      "-o src/main/resources/lib/libscalauast.dylib " + // sic, must be in the classpath for the test
+      sourceFiles +
+      "src/main/resources/libuast/libuast.a "
 
     checkedProcess(cmd, "macOS build")
   } else {
@@ -172,12 +177,13 @@ def compileUnix(sourceFiles: String) = {
       "-I" + javaHome + "/include/ " +
       "-I" + javaHome + "/include/linux " +
       "-Isrc/main/resources/libuast " +
-      "-Lsrc/main/resources/libuast " +
-      "-l uast " +
       "-o src/main/resources/lib/libscalauast.so " +
-      sourceFiles + " "
+      sourceFiles +
+      "src/main/resources/libuast/libuast.a "
 
     checkedProcess(cmd, "Linux build")
+
+    "nm src/main/resources/lib/libscalauast.so" #| "grep -c UastDecode"!
   }
 }
 
@@ -199,10 +205,9 @@ def crossCompileMacOS(sourceFiles: String): Unit = {
       "-I/usr/lib/jvm/java-8-openjdk-amd64/include " +
       "-I/usr/lib/jvm/java-8-openjdk-amd64/include/linux " +
       "-Isrc/libuast-native/ " +
-      "-Lsrc/main/resources/libuast " +
-      "-l uast " +
       "-o src/main/resources/lib/libscalauast.dylib " +
-      sourceFiles
+      sourceFiles +
+      "src/main/resources/libuast/libuast.a "
 
   checkedProcess(cmd, "macOS cross-compile build")
 }

src/main/scala/org/bblfsh/client/v2/Context.scala

@@ -9,6 +9,10 @@ case class Context(nativeContext: Long) {
 
     @native def filter()
 
+    // TODO(bzz): add loading of the root node, after clarifying when it's needed
+    // https://github.com/bblfsh/client-python/blob/master/bblfsh/pyuast.cc#L364
+    // @native def load(): ?
+
     override def finalize(): Unit = {
         this.dispose()
     }