Skip to content
This repository has been archived by the owner on Dec 14, 2021. It is now read-only.

build: make Java tests run on Linux CI #1127

Merged
merged 3 commits into from
Jan 11, 2021
Merged

build: make Java tests run on Linux CI #1127

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
82b3b14
add logging to java detection for tests
mlangkabel Jan 11, 2021
a92e302
add ApplicationSettings.xml for CI
mlangkabel Jan 11, 2021
3975a5c
copy appsettings to docker container
mlangkabel Jan 11, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 22 additions & 0 deletions deployment/dockerfiles/linux/travis_ci/ApplicationSettings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
<?xml version="1.0" encoding="utf-8" ?>
<config>
<application>
<window_base_width>500</window_base_width>
<window_base_height>500</window_base_height>
</application>
<indexing>
<java>
<java_path>/usr/lib/jvm/java-1.8.0-openjdk-1.8.0.272.b10-1.el7_9.x86_64/jre/lib/amd64/server/libjvm.so</java_path>
</java>
<indexer_thread_count>0</indexer_thread_count>
</indexing>
<user>
<recent_projects>
<recent_project>./projects/tutorial/tutorial.srctrlprj</recent_project>
<recent_project>./projects/tictactoe_cpp/tictactoe_cpp.srctrlprj</recent_project>
<recent_project>./projects/tictactoe_py/tictactoe_py.srctrlprj</recent_project>
<recent_project>./projects/javaparser/javaparser.srctrlprj</recent_project>
</recent_projects>
</user>
<version>8</version>
</config>
8 changes: 8 additions & 0 deletions deployment/dockerfiles/linux/travis_ci/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"]
11 changes: 11 additions & 0 deletions src/test/test_main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Expand Down