From f18bef7f73fcd140492b7ab207bcb9e44fffcacb Mon Sep 17 00:00:00 2001 From: Malte Langkabel Date: Mon, 11 Jan 2021 14:34:28 +0100 Subject: [PATCH] build: make Java tests run on Linux CI (#1127) --- .../linux/travis_ci/ApplicationSettings.xml | 22 +++++++++++++++++++ .../dockerfiles/linux/travis_ci/Dockerfile | 8 +++++++ src/test/test_main.cpp | 11 ++++++++++ 3 files changed, 41 insertions(+) create mode 100644 deployment/dockerfiles/linux/travis_ci/ApplicationSettings.xml diff --git a/deployment/dockerfiles/linux/travis_ci/ApplicationSettings.xml b/deployment/dockerfiles/linux/travis_ci/ApplicationSettings.xml new file mode 100644 index 00000000..7063ee8c --- /dev/null +++ b/deployment/dockerfiles/linux/travis_ci/ApplicationSettings.xml @@ -0,0 +1,22 @@ + + + + 500 + 500 + + + + /usr/lib/jvm/java-1.8.0-openjdk-1.8.0.272.b10-1.el7_9.x86_64/jre/lib/amd64/server/libjvm.so + + 0 + + + + ./projects/tutorial/tutorial.srctrlprj + ./projects/tictactoe_cpp/tictactoe_cpp.srctrlprj + ./projects/tictactoe_py/tictactoe_py.srctrlprj + ./projects/javaparser/javaparser.srctrlprj + + + 8 + diff --git a/deployment/dockerfiles/linux/travis_ci/Dockerfile b/deployment/dockerfiles/linux/travis_ci/Dockerfile index 4898439a..26d6b082 100644 --- a/deployment/dockerfiles/linux/travis_ci/Dockerfile +++ b/deployment/dockerfiles/linux/travis_ci/Dockerfile @@ -1,5 +1,13 @@ FROM coatisoftware/centos7_64_qt_llvm:qt5126-llvm1100 +WORKDIR /home/builder + +RUN mkdir .config && \ + cd .config && \ + mkdir sourcetrail + +COPY ApplicationSettings.xml /home/builder/.config/sourcetrail/ApplicationSettings.xml + COPY entrypoint.sh /entrypoint.sh ENTRYPOINT ["/entrypoint.sh"] diff --git a/src/test/test_main.cpp b/src/test/test_main.cpp index fdbae67f..d2e93512 100644 --- a/src/test/test_main.cpp +++ b/src/test/test_main.cpp @@ -43,7 +43,18 @@ struct EventListener: Catch::TestEventListenerBase if (!paths.empty()) { ApplicationSettings::getInstance()->setJavaPath(paths.front()); + std::cout << "Java path written to settings: " + << ApplicationSettings::getInstance()->getJavaPath().str() << std::endl; } + else + { + std::cout << "no Java" << std::endl; + } + } + else + { + std::cout << "Java path read form settings: " + << ApplicationSettings::getInstance()->getJavaPath().str() << std::endl; } #endif }