Skip to content

Commit efb58b1

Browse files
authored
opencv-python package is broken; disable python codegen tests (#760)
Disable python tests on Travis until opencv-python has a build for 3.6
1 parent 69e3f66 commit efb58b1

File tree

2 files changed

+13
-7
lines changed

2 files changed

+13
-7
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ script:
3838
# will not be able to run MainWindowTest.testDragOperationFromPaletteToPipeline
3939
- |
4040
if [[ "$TRAVIS_OS_NAME" == "osx" ]];
41-
then ./gradlew check jacocoTestReport jacocoRootReport --stacktrace -Pheadless=true -PlogTests -Dscan -Pgeneration -PjniLocation=$HOME/opencv/jni;
41+
then ./gradlew check jacocoTestReport jacocoRootReport --stacktrace -Pheadless=true -PlogTests -Dscan -Pgeneration -PjniLocation=$HOME/opencv/jni -PjvmArgs=["-Dcodegen.python.disabled=true"];
4242
else ./gradlew check jacocoTestReport jacocoRootReport --stacktrace -Pheadless=true -PlogTests -Dscan;
4343
fi
4444

ui/src/test/java/edu/wpi/grip/ui/codegeneration/AbstractGenerationTesting.java

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
import edu.wpi.grip.core.sockets.InputSocket;
88
import edu.wpi.grip.core.sockets.OutputSocket;
99
import edu.wpi.grip.core.sources.ImageFileSource;
10-
//import edu.wpi.grip.ui.codegeneration.tools.CppPipelineInterfacer;
1110
import edu.wpi.grip.ui.codegeneration.tools.HelperTools;
1211
import edu.wpi.grip.ui.codegeneration.tools.JavaPipelineInterfacer;
1312
import edu.wpi.grip.ui.codegeneration.tools.PipelineCreator;
@@ -83,11 +82,18 @@ protected final void test(BooleanSupplier setup, Consumer<PipelineInterfacer> te
8382
gen.export(fileName);
8483
Language current = Language.JAVA;
8584
try {
86-
JavaPipelineInterfacer jpip = new JavaPipelineInterfacer(fileName + ".java");
87-
test.accept(jpip);
88-
current = Language.PYTHON;
89-
PythonPipelineInterfacer ppip = new PythonPipelineInterfacer(fileName);
90-
test.accept(ppip);
85+
if (Boolean.valueOf(System.getProperty("codegen.java.disabled", "false"))) {
86+
JavaPipelineInterfacer jpip = new JavaPipelineInterfacer(fileName + ".java");
87+
test.accept(jpip);
88+
}
89+
90+
if (Boolean.valueOf(System.getProperty("codegen.python.disabled", "false"))) {
91+
current = Language.PYTHON;
92+
PythonPipelineInterfacer ppip = new PythonPipelineInterfacer(fileName);
93+
test.accept(ppip);
94+
}
95+
96+
// C++ is just plain broken
9197
//current = Language.CPP;
9298
//CppPipelineInterfacer cpip = new CppPipelineInterfacer(fileName);
9399
//test.accept(cpip);

0 commit comments

Comments
 (0)