ctf: Enable the CTF-testsuite tests

But blacklist those we know we don't currently pass. At least this
allows us to run the ones we *do* pass in CI.

Change-Id: I020d9f1ddfa5537c6f65c5f497c080541e4fb1ba
Signed-off-by: Alexandre Montplaisir <alexmonthy@voxpopuli.im>
Reviewed-on: https://git.eclipse.org/r/20983
Tested-by: Hudson CI
Reviewed-by: Matthew Khouzam <matthew.khouzam@ericsson.com>
IP-Clean: Matthew Khouzam <matthew.khouzam@ericsson.com>
Tested-by: Matthew Khouzam <matthew.khouzam@ericsson.com>

diff --git a/org.eclipse.linuxtools.ctf.core.tests/src/org/eclipse/linuxtools/ctf/core/tests/ctftestsuite/CtfTestSuiteTests.java b/org.eclipse.linuxtools.ctf.core.tests/src/org/eclipse/linuxtools/ctf/core/tests/ctftestsuite/CtfTestSuiteTests.java
index ec0b7d8da2ef220aac06152d768ed5f97535a012..7f363f391d137f35a664f7b4f0dd7e8ce0f24158 100644 (file)
--- a/org.eclipse.linuxtools.ctf.core.tests/src/org/eclipse/linuxtools/ctf/core/tests/ctftestsuite/CtfTestSuiteTests.java
+++ b/org.eclipse.linuxtools.ctf.core.tests/src/org/eclipse/linuxtools/ctf/core/tests/ctftestsuite/CtfTestSuiteTests.java
@@ -44,7 +44,18 @@ public class CtfTestSuiteTests {
     @Rule
     public TestRule globalTimeout = new Timeout(10000);
 
-    private static final String basePath = "traces/ctf-testsuite/tests/1.8/";
+    private static final String BASE_PATH = "traces/ctf-testsuite/tests/1.8/";
+
+    /**
+     * Test we know are currently failing. Ignore them so we can at least run
+     * the others.
+     *
+     * TODO Actually fix them!
+     */
+    private static final String[] IGNORED_TESTS = {
+            "regression/metadata/pass/sequence-typedef-length",
+            "regression/metadata/pass/array-of-struct"
+    };
 
     private final String fTracePath;
     private final boolean fExpectSuccess;
@@ -62,20 +73,20 @@ public class CtfTestSuiteTests {
     public static Iterable<Object[]> getTracePaths() {
         final List<Object[]> dirs = new LinkedList<>();
 
-        addDirsFrom(dirs, basePath + "fuzzing/metadata/fail", false);
-        addDirsFrom(dirs, basePath + "fuzzing/metadata/pass", true);
-        addDirsFrom(dirs, basePath + "fuzzing/stream/fail", false);
-        addDirsFrom(dirs, basePath + "fuzzing/stream/pass", true);
+        addDirsFrom(dirs, BASE_PATH + "fuzzing/metadata/fail", false);
+        addDirsFrom(dirs, BASE_PATH + "fuzzing/metadata/pass", true);
+        addDirsFrom(dirs, BASE_PATH + "fuzzing/stream/fail", false);
+        addDirsFrom(dirs, BASE_PATH + "fuzzing/stream/pass", true);
 
-        addDirsFrom(dirs, basePath + "regression/metadata/fail", false);
-        addDirsFrom(dirs, basePath + "regression/metadata/pass", true);
-        addDirsFrom(dirs, basePath + "regression/stream/fail", false);
-        addDirsFrom(dirs, basePath + "regression/stream/pass", true);
+        addDirsFrom(dirs, BASE_PATH + "regression/metadata/fail", false);
+        addDirsFrom(dirs, BASE_PATH + "regression/metadata/pass", true);
+        addDirsFrom(dirs, BASE_PATH + "regression/stream/fail", false);
+        addDirsFrom(dirs, BASE_PATH + "regression/stream/pass", true);
 
-        addDirsFrom(dirs, basePath + "stress/metadata/fail", false);
-        addDirsFrom(dirs, basePath + "stress/metadata/pass", true);
-        addDirsFrom(dirs, basePath + "stress/stream/fail", false);
-        addDirsFrom(dirs, basePath + "stress/stream/pass", true);
+        addDirsFrom(dirs, BASE_PATH + "stress/metadata/fail", false);
+        addDirsFrom(dirs, BASE_PATH + "stress/metadata/pass", true);
+        addDirsFrom(dirs, BASE_PATH + "stress/stream/fail", false);
+        addDirsFrom(dirs, BASE_PATH + "stress/stream/pass", true);
 
         return dirs;
     }
@@ -86,11 +97,24 @@ public class CtfTestSuiteTests {
             return;
         }
         for (File traceDir : traceDirs) {
-            if (traceDir.isDirectory()) {
-                Object array[] = new Object[] { traceDir.getPath(), expectSuccess };
-                dirs.add(array);
+            /* Skip the "run.sh" files and blacklisted tests */
+            if (!traceDir.isDirectory() || testIsBlacklisted(traceDir.getPath())) {
+                continue;
+            }
+
+            /* Add this test case to the list of tests to run */
+            Object array[] = new Object[] { traceDir.getPath(), expectSuccess };
+            dirs.add(array);
+        }
+    }
+
+    private static boolean testIsBlacklisted(String fullPath) {
+        for (String ignoredTest : IGNORED_TESTS) {
+            if (fullPath.contains(ignoredTest)) {
+                return true;
             }
         }
+        return false;
     }
 
     // ------------------------------------------------------------------------

diff --git a/org.eclipse.linuxtools.ctf.core.tests/src/org/eclipse/linuxtools/ctf/core/tests/ctftestsuite/TestAll.java b/org.eclipse.linuxtools.ctf.core.tests/src/org/eclipse/linuxtools/ctf/core/tests/ctftestsuite/TestAll.java
index 2abb6edd3177012b5a80b7689d43561645a290ba..32f3c7401d0f23f501eb58e2fd60c49077f4e11d 100644 (file)
--- a/org.eclipse.linuxtools.ctf.core.tests/src/org/eclipse/linuxtools/ctf/core/tests/ctftestsuite/TestAll.java
+++ b/org.eclipse.linuxtools.ctf.core.tests/src/org/eclipse/linuxtools/ctf/core/tests/ctftestsuite/TestAll.java
@@ -20,12 +20,10 @@ import org.junit.runners.Suite;
  * package.
  *
  * @author ematkho
- * @version $Revision: 1.0 $
  */
 @RunWith(Suite.class)
 @Suite.SuiteClasses({
-    // FIXME Disabled until the failures are actually fixed
-    // CtfTestSuiteTests.class
+     CtfTestSuiteTests.class
 })
 public class TestAll {