Skip to content

Git storage test #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Git storage test #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
638f84d
test: manually run gitStorageTest
dirkhh Oct 24, 2020
02819f6
tests: move TestGitStorage to its own test config
dirkhh Oct 24, 2020
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
3 changes: 2 additions & 1 deletion .github/workflows/linux-bionic-5.9.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,5 +41,6 @@ jobs:
# and now run the tests - with Qt 5.9 we can only run the desktop flavor
echo "------------------------------------"
echo "run tests"
cd build
cd build/tests
xvfb-run --auto-servernum ./TestGitStorage -v2
xvfb-run --auto-servernum make check
6 changes: 4 additions & 2 deletions .github/workflows/linux-eoan-5.12.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,8 @@ jobs:
echo "--------------------------------------------------------------"
echo "running tests for mobile"

cd build-mobile
cd build-mobile/tests
xvfb-run --auto-servernum ./TestGitStorage -v2
xvfb-run --auto-servernum make check

- name: build Subsurface
Expand All @@ -64,6 +65,7 @@ jobs:
run: |
echo "--------------------------------------------------------------"
echo "running tests for desktop"
cd build
cd build/tests
xvfb-run --auto-servernum ./TestGitStorage -v2
xvfb-run --auto-servernum make check

6 changes: 4 additions & 2 deletions .github/workflows/linux-groovy-5.14.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,8 @@ jobs:
echo "--------------------------------------------------------------"
echo "running tests for mobile"

cd build-mobile
cd build-mobile/tests
xvfb-run --auto-servernum ./TestGitStorage -v2
xvfb-run --auto-servernum make check

- name: build Subsurface
Expand All @@ -64,6 +65,7 @@ jobs:
run: |
echo "--------------------------------------------------------------"
echo "running tests for desktop"
cd build
cd build/tests
xvfb-run --auto-servernum ./TestGitStorage -v2
xvfb-run --auto-servernum make check

2 changes: 2 additions & 0 deletions .github/workflows/mac.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ jobs:
export QT_ROOT=${GITHUB_WORKSPACE}/Qt/5.13.0/clang_64
export QT_QPA_PLATFORM_PLUGIN_PATH=$QT_ROOT/plugins
cd ${GITHUB_WORKSPACE}/build-mobile/tests
./TestGitStorage -v2
make check

- name: build Subsurface
Expand All @@ -65,5 +66,6 @@ jobs:
export QT_ROOT=${GITHUB_WORKSPACE}/Qt/5.13.0/clang_64
export QT_QPA_PLATFORM_PLUGIN_PATH=$QT_ROOT/plugins
cd ${GITHUB_WORKSPACE}/build/tests
./TestGitStorage -v2
make check

10 changes: 6 additions & 4 deletions tests/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,9 @@ endif()

# Helper function TEST used to created rules to build, link, install and run tests
function(TEST NAME FILE)
if(DEFINED ARGV2)
set(CFGARG "CONFIGURATIONS" ${ARGV2})
endif()
get_filename_component(HDR "${FILE}" NAME_WE)
add_executable(${NAME} ${FILE} ${HDR}.h)
target_link_libraries(
Expand All @@ -70,7 +73,7 @@ function(TEST NAME FILE)
# Run test using wine
if(WINE_PROGRAM)
add_test(
NAME ${NAME}
NAME ${NAME} ${CFGARG}
COMMAND "$<TARGET_FILE:${NAME}>"
WORKING_DIRECTORY ${WINDOWS_STAGING_TESTS}
)
Expand All @@ -80,7 +83,7 @@ function(TEST NAME FILE)
set_tests_properties(${NAME} PROPERTIES DEPENDS PrepareTests)
endif()
else()
add_test(NAME ${NAME} COMMAND $<TARGET_FILE:${NAME}>)
add_test(NAME ${NAME} ${CFGARG} COMMAND $<TARGET_FILE:${NAME}>)
endif()
endfunction()

Expand Down Expand Up @@ -112,7 +115,7 @@ TEST(TestDiveSiteDuplication testdivesiteduplication.cpp)
TEST(TestRenumber testrenumber.cpp)
# this keeps randomly failing and I don't understand why
# too many false positives, so disabling this test for now
TEST(TestGitStorage testgitstorage.cpp)
TEST(TestGitStorage testgitstorage.cpp storageconfig)
TEST(TestPicture testpicture.cpp)
TEST(TestMerge testmerge.cpp)
TEST(TestTagList testtaglist.cpp)
Expand Down Expand Up @@ -150,7 +153,6 @@ add_custom_target(check COMMAND ${CMAKE_CTEST_COMMAND}
TestProfile
TestGpsCoords
TestParse
# TestGitStorage
TestPlan
TestAirPressure
TestDiveSiteDuplication
Expand Down