From 3a6d609c1a46a666cce04a6a68d5a3ae02ab2fc0 Mon Sep 17 00:00:00 2001 From: Dominik Berner Date: Tue, 11 Feb 2025 21:38:49 +0100 Subject: [PATCH 1/5] Upgrade catch version --- conanfile.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conanfile.txt b/conanfile.txt index da38c1a8..feedb8e4 100644 --- a/conanfile.txt +++ b/conanfile.txt @@ -1,5 +1,5 @@ [requires] -catch2/3.4.0 +catch2/3.8.0 [generators] CMakeDeps \ No newline at end of file From d67bae52d22b67f61b2ede4e1d3e7082762c502a Mon Sep 17 00:00:00 2001 From: Dominik Berner Date: Tue, 11 Feb 2025 21:52:50 +0100 Subject: [PATCH 2/5] Specify macos version --- .github/workflows/ci.yml | 2 +- test/compilation-tests.sh | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a2a6341c..4bc91e42 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -30,7 +30,7 @@ jobs: compiler-name-conan: clang - name: macos-apple-clang - os: macos-latest + os: macos-14 compiler-cppstd: "gnu17" - name: windows-msvc-19 diff --git a/test/compilation-tests.sh b/test/compilation-tests.sh index 6c036394..bc165f1b 100755 --- a/test/compilation-tests.sh +++ b/test/compilation-tests.sh @@ -7,13 +7,14 @@ INSTALL_PATH=$(realpath ~/SI-install) buildSingleTarget() { + set -x if [ "${2}" == "DEFAULTBUILD" ]; then cmake ${ROOT_DIR}/test/src/compilation_tests/ -B${BUILD_DIR} -DCMAKE_PREFIX_PATH=${BUILD_DIR} -DCMAKE_INSTALL_PREFIX:PATH=${INSTALL_PATH} -DCMAKE_BUILD_TYPE=Release -G Ninja > /dev/null - assertEquals "Configuration successful" 0 $? + assertEquals "Configuration for defaultbuild successful" 0 $? else cmake ${ROOT_DIR}/test/src/compilation_tests/ -B${BUILD_DIR} -DCMAKE_PREFIX_PATH=${BUILD_DIR} -DCMAKE_INSTALL_PREFIX:PATH=${INSTALL_PATH} -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_FLAGS="-DSI_DISABLE_IMPLICIT_RATIO_CONVERSION" -G Ninja > /dev/null - assertEquals "Configuration successful" 0 $? + assertEquals "Configuration for build with disabled ration cinversion successful" 0 $? fi cmake --build ${BUILD_DIR} --config Release --target $1 > /dev/null @@ -24,6 +25,7 @@ buildSingleTarget() else assertNotEquals "Building fails" 0 $RESULT fi + set +x } oneTimeSetUp(){ From ab4e93fc51d08deeceaf92b79b7fb8ff849e9635 Mon Sep 17 00:00:00 2001 From: Dominik Berner Date: Tue, 11 Feb 2025 21:59:25 +0100 Subject: [PATCH 3/5] Pass test name to buildsingletarget --- test/compilation-tests.sh | 88 +++++++++++++++++++-------------------- 1 file changed, 44 insertions(+), 44 deletions(-) diff --git a/test/compilation-tests.sh b/test/compilation-tests.sh index bc165f1b..285773c2 100755 --- a/test/compilation-tests.sh +++ b/test/compilation-tests.sh @@ -10,11 +10,11 @@ buildSingleTarget() set -x if [ "${2}" == "DEFAULTBUILD" ]; then cmake ${ROOT_DIR}/test/src/compilation_tests/ -B${BUILD_DIR} -DCMAKE_PREFIX_PATH=${BUILD_DIR} -DCMAKE_INSTALL_PREFIX:PATH=${INSTALL_PATH} -DCMAKE_BUILD_TYPE=Release -G Ninja > /dev/null - assertEquals "Configuration for defaultbuild successful" 0 $? + assertEquals "Configuration for defaultbuild successful" 0 $? ${3} else cmake ${ROOT_DIR}/test/src/compilation_tests/ -B${BUILD_DIR} -DCMAKE_PREFIX_PATH=${BUILD_DIR} -DCMAKE_INSTALL_PREFIX:PATH=${INSTALL_PATH} -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_FLAGS="-DSI_DISABLE_IMPLICIT_RATIO_CONVERSION" -G Ninja > /dev/null - assertEquals "Configuration for build with disabled ration cinversion successful" 0 $? + assertEquals "Configuration for build with disabled ration cinversion successful" 0 $? ${3} fi cmake --build ${BUILD_DIR} --config Release --target $1 > /dev/null @@ -72,53 +72,53 @@ testSISelfFailedCompilationWhenImplicitConversionDisabled() { testOperatorCopyCtorWithSameRatioCompilesWhenDefaultInvocation() { TARGET=CMakeFiles/SI-Compilation-Tests.dir/copy_ctor_with_same_ratio_test.cc.o - buildSingleTarget ${TARGET} DEFAULTBUILD PASS + buildSingleTarget ${TARGET} DEFAULTBUILD PASS "testOperatorCopyCtorWithSameRatioCompilesWhenDefaultInvocation" } testOperatorCopyCtorWithSameRatioCompilesWhenImplicitConversionDisabled() { TARGET=CMakeFiles/SI-Compilation-Tests.dir/copy_ctor_with_same_ratio_test.cc.o - buildSingleTarget ${TARGET} RESTRICTEDBUILD PASS + buildSingleTarget ${TARGET} RESTRICTEDBUILD PASS "testOperatorCopyCtorWithSameRatioCompilesWhenImplicitConversionDisabled" } testOperatorCopyCtorCompilesWhenDefaultInvocation() { TARGET=CMakeFiles/SI-Compilation-Tests.dir/copy_ctor_test.cc.o - buildSingleTarget ${TARGET} DEFAULTBUILD PASS + buildSingleTarget ${TARGET} DEFAULTBUILD PASS "testOperatorCopyCtorCompilesWhenDefaultInvocation" } testOperatorCopyCtorFailsWhenImplicitConversionDisabled() { TARGET=CMakeFiles/SI-Compilation-Tests.dir/copy_ctor_test.cc.o - buildSingleTarget ${TARGET} RESTRICTEDBUILD FAIL + buildSingleTarget ${TARGET} RESTRICTEDBUILD FAIL "testOperatorCopyCtorFailsWhenImplicitConversionDisabled" } testOperatorMoveCtorWithSameRatioCompilesWhenDefaultInvocation() { TARGET=CMakeFiles/SI-Compilation-Tests.dir/move_ctor_with_same_ratio_test.cc.o - buildSingleTarget ${TARGET} DEFAULTBUILD PASS + buildSingleTarget ${TARGET} DEFAULTBUILD PASS "testOperatorMoveCtorWithSameRatioCompilesWhenDefaultInvocation" } testOperatorMoveCtorWithSameRatioCompilesWhenImplicitConversionDisabled() { TARGET=CMakeFiles/SI-Compilation-Tests.dir/move_ctor_with_same_ratio_test.cc.o - buildSingleTarget ${TARGET} RESTRICTEDBUILD PASS + buildSingleTarget ${TARGET} RESTRICTEDBUILD PASS "testOperatorMoveCtorWithSameRatioCompilesWhenImplicitConversionDisabled" } testOperatorMoveCtorCompilesWhenDefaultInvocation() { TARGET=CMakeFiles/SI-Compilation-Tests.dir/move_ctor_test.cc.o - buildSingleTarget ${TARGET} DEFAULTBUILD PASS + buildSingleTarget ${TARGET} DEFAULTBUILD PASS "testOperatorMoveCtorCompilesWhenDefaultInvocation" } testOperatorMoveCtorFailsWhenImplicitConversionDisabled() { TARGET=CMakeFiles/SI-Compilation-Tests.dir/move_ctor_test.cc.o - buildSingleTarget ${TARGET} RESTRICTEDBUILD FAIL + buildSingleTarget ${TARGET} RESTRICTEDBUILD FAIL "testOperatorMoveCtorFailsWhenImplicitConversionDisabled" } @@ -126,171 +126,171 @@ testOperatorMoveCtorFailsWhenImplicitConversionDisabled() testOperatorCopyAssignmentCompilesWhenDefaultInvocation() { TARGET=CMakeFiles/SI-Compilation-Tests.dir/operator_copy_assignment_test.cc.o - buildSingleTarget ${TARGET} DEFAULTBUILD PASS + buildSingleTarget ${TARGET} DEFAULTBUILD PASS "testOperatorCopyAssignmentCompilesWhenDefaultInvocation" } testOperatorCopyAssignmentFailsWhenImplicitConversionDisabled() { TARGET=CMakeFiles/SI-Compilation-Tests.dir/operator_copy_assignment_test.cc.o - buildSingleTarget ${TARGET} RESTRICTEDBUILD FAIL + buildSingleTarget ${TARGET} RESTRICTEDBUILD FAIL "testOperatorCopyAssignmentFailsWhenImplicitConversionDisabled" } testOperatorCopyAssignmentWithSameRatioCompilesWhenDefaultInvocation() { TARGET=CMakeFiles/SI-Compilation-Tests.dir/operator_copy_assignment_same_ratio_test.cc.o - buildSingleTarget ${TARGET} DEFAULTBUILD PASS + buildSingleTarget ${TARGET} DEFAULTBUILD PASS "testOperatorCopyAssignmentWithSameRatioCompilesWhenDefaultInvocation" } testOperatorCopyAssignmentWithSameRatioCompilesWhenImplicitConversionDisabled() { TARGET=CMakeFiles/SI-Compilation-Tests.dir/operator_copy_assignment_same_ratio_test.cc.o - buildSingleTarget ${TARGET} RESTRICTEDBUILD PASS + buildSingleTarget ${TARGET} RESTRICTEDBUILD PASS "testOperatorCopyAssignmentWithSameRatioCompilesWhenImplicitConversionDisabled" } testOperatorMoveAssignmentCompilesWhenDefaultInvocation() { TARGET=CMakeFiles/SI-Compilation-Tests.dir/operator_move_assignment_test.cc.o - buildSingleTarget ${TARGET} DEFAULTBUILD PASS + buildSingleTarget ${TARGET} DEFAULTBUILD PASS "testOperatorMoveAssignmentCompilesWhenDefaultInvocation" } testOperatorMoveAssignmentFailsWhenImplicitConversionDisabled() { TARGET=CMakeFiles/SI-Compilation-Tests.dir/operator_move_assignment_test.cc.o - buildSingleTarget ${TARGET} RESTRICTEDBUILD FAIL + buildSingleTarget ${TARGET} RESTRICTEDBUILD FAIL "testOperatorMoveAssignmentFailsWhenImplicitConversionDisabled" } testOperatorMoveAssignmentWithSameRatioCompilesWhenDefaultInvocation() { TARGET=CMakeFiles/SI-Compilation-Tests.dir/operator_move_assignment_same_ratio_test.cc.o - buildSingleTarget ${TARGET} DEFAULTBUILD PASS + buildSingleTarget ${TARGET} DEFAULTBUILD PASS "testOperatorMoveAssignmentWithSameRatioCompilesWhenDefaultInvocation" } testOperatorMoveAssignmentWithSameRatioCompilesWhenImplicitConversionDisabled() { TARGET=CMakeFiles/SI-Compilation-Tests.dir/operator_move_assignment_same_ratio_test.cc.o - buildSingleTarget ${TARGET} RESTRICTEDBUILD PASS + buildSingleTarget ${TARGET} RESTRICTEDBUILD PASS "testOperatorMoveAssignmentWithSameRatioCompilesWhenImplicitConversionDisabled" } testOperatorEqualsCompilesWhenDefaultInvocation() { TARGET=CMakeFiles/SI-Compilation-Tests.dir/operator_equals_test.cc.o - buildSingleTarget ${TARGET} DEFAULTBUILD PASS + buildSingleTarget ${TARGET} DEFAULTBUILD PASS "testOperatorEqualsCompilesWhenDefaultInvocation" } testOperatorEqualsFailsWhenImplicitConversionDisabled() { TARGET=CMakeFiles/SI-Compilation-Tests.dir/operator_equals_test.cc.o - buildSingleTarget ${TARGET} RESTRICTEDBUILD FAIL + buildSingleTarget ${TARGET} RESTRICTEDBUILD FAIL "testOperatorEqualsFailsWhenImplicitConversionDisabled" } testOperatorLessThanCompilesWhenDefaultInvocation() { TARGET=CMakeFiles/SI-Compilation-Tests.dir/operator_less_than_test.cc.o - buildSingleTarget ${TARGET} DEFAULTBUILD PASS + buildSingleTarget ${TARGET} DEFAULTBUILD PASS "testOperatorLessThanCompilesWhenDefaultInvocation" } testOperatorLessThanFailsWhenImplicitConversionDisabled() { TARGET=CMakeFiles/SI-Compilation-Tests.dir/operator_less_than_test.cc.o - buildSingleTarget ${TARGET} RESTRICTEDBUILD FAIL + buildSingleTarget ${TARGET} RESTRICTEDBUILD FAIL "testOperatorLessThanFailsWhenImplicitConversionDisabled" } testOperatorGreaterThanCompilesWhenDefaultInvocation() { TARGET=CMakeFiles/SI-Compilation-Tests.dir/operator_greater_than_test.cc.o - buildSingleTarget ${TARGET} DEFAULTBUILD PASS + buildSingleTarget ${TARGET} DEFAULTBUILD PASS "testOperatorGreaterThanCompilesWhenDefaultInvocation" } testOperatorGreaterThanFailsWhenImplicitConversionDisabled() { TARGET=CMakeFiles/SI-Compilation-Tests.dir/operator_greater_than_test.cc.o - buildSingleTarget ${TARGET} RESTRICTEDBUILD FAIL + buildSingleTarget ${TARGET} RESTRICTEDBUILD FAIL "testOperatorGreaterThanFailsWhenImplicitConversionDisabled" } testOperatorMultiplyCompilesWhenDefaultInvocation() { TARGET=CMakeFiles/SI-Compilation-Tests.dir/operator_multiply_test.cc.o - buildSingleTarget ${TARGET} DEFAULTBUILD PASS + buildSingleTarget ${TARGET} DEFAULTBUILD PASS "testOperatorMultiplyCompilesWhenDefaultInvocation" } testOperatorMultiplyFailsWhenImplicitConversionDisabled() { TARGET=CMakeFiles/SI-Compilation-Tests.dir/operator_multiply_test.cc.o - buildSingleTarget ${TARGET} RESTRICTEDBUILD FAIL + buildSingleTarget ${TARGET} RESTRICTEDBUILD FAIL "testOperatorMultiplyFailsWhenImplicitConversionDisabled" } testOperatorAddCompilesWhenDefaultInvocation() { TARGET=CMakeFiles/SI-Compilation-Tests.dir/operator_add_test.cc.o - buildSingleTarget ${TARGET} DEFAULTBUILD PASS + buildSingleTarget ${TARGET} DEFAULTBUILD PASS "testOperatorAddCompilesWhenDefaultInvocation" } testOperatorAddFailsWhenImplicitConversionDisabled() { TARGET=CMakeFiles/SI-Compilation-Tests.dir/operator_add_test.cc.o - buildSingleTarget ${TARGET} RESTRICTEDBUILD FAIL + buildSingleTarget ${TARGET} RESTRICTEDBUILD FAIL "testOperatorAddFailsWhenImplicitConversionDisabled" } testOperatorAddAssignmentCompilesWhenDefaultInvocation() { TARGET=CMakeFiles/SI-Compilation-Tests.dir/operator_add_assignment_test.cc.o - buildSingleTarget ${TARGET} DEFAULTBUILD PASS + buildSingleTarget ${TARGET} DEFAULTBUILD PASS "testOperatorAddAssignmentCompilesWhenDefaultInvocation" } testOperatorAddAssignmentFailsWhenImplicitConversionDisabled() { TARGET=CMakeFiles/SI-Compilation-Tests.dir/operator_add_assignment_test.cc.o - buildSingleTarget ${TARGET} RESTRICTEDBUILD FAIL + buildSingleTarget ${TARGET} RESTRICTEDBUILD FAIL "testOperatorAddAssignmentFailsWhenImplicitConversionDisabled" } testOperatorAddAssignmentSameRatioCompilesWhenImplicitConversionDisabled() { TARGET=CMakeFiles/SI-Compilation-Tests.dir/operator_add_assignment_same_ratio_test.cc.o - buildSingleTarget ${TARGET} RESTRICTEDBUILD PASS + buildSingleTarget ${TARGET} RESTRICTEDBUILD PASS "testOperatorAddAssignmentSameRatioCompilesWhenImplicitConversionDisabled" } testOperatorSubtractCompilesWhenDefaultInvocation() { TARGET=CMakeFiles/SI-Compilation-Tests.dir/operator_subtract_test.cc.o - buildSingleTarget ${TARGET} DEFAULTBUILD PASS + buildSingleTarget ${TARGET} DEFAULTBUILD PASS "testOperatorSubtractCompilesWhenDefaultInvocation" } testOperatorSubtractFailsWhenImplicitConversionDisabled() { TARGET=CMakeFiles/SI-Compilation-Tests.dir/operator_subtract_test.cc.o - buildSingleTarget ${TARGET} RESTRICTEDBUILD FAIL + buildSingleTarget ${TARGET} RESTRICTEDBUILD FAIL "testOperatorSubtractFailsWhenImplicitConversionDisabled" } testOperatorSubtractAssignmentCompilesWhenDefaultInvocation() { TARGET=CMakeFiles/SI-Compilation-Tests.dir/operator_subtract_assignment_test.cc.o - buildSingleTarget ${TARGET} DEFAULTBUILD PASS + buildSingleTarget ${TARGET} DEFAULTBUILD PASS "testOperatorSubtractAssignmentCompilesWhenDefaultInvocation" } testOperatorSubtractAssignmentFailsWhenImplicitConversionDisabled() { TARGET=CMakeFiles/SI-Compilation-Tests.dir/operator_subtract_assignment_test.cc.o - buildSingleTarget ${TARGET} RESTRICTEDBUILD FAIL + buildSingleTarget ${TARGET} RESTRICTEDBUILD FAIL "testOperatorSubtractAssignmentFailsWhenImplicitConversionDisabled" } testOperatorSubtractAssignmentWithSameRatioCompilesWhenImplicitConversionDisabled() { TARGET=CMakeFiles/SI-Compilation-Tests.dir/operator_subtract_assignment_same_ratio_test.cc.o - buildSingleTarget ${TARGET} RESTRICTEDBUILD PASS + buildSingleTarget ${TARGET} RESTRICTEDBUILD PASS "testOperatorSubtractAssignmentWithSameRatioCompilesWhenImplicitConversionDisabled" } @@ -298,53 +298,53 @@ testOperatorSubtractAssignmentWithSameRatioCompilesWhenImplicitConversionDisable testOperatorDivideCompilesWhenDefaultInvocation() { TARGET=CMakeFiles/SI-Compilation-Tests.dir/operator_divide_test.cc.o - buildSingleTarget ${TARGET} DEFAULTBUILD PASS + buildSingleTarget ${TARGET} DEFAULTBUILD PASS "testOperatorDivideCompilesWhenDefaultInvocation" } testOperatorDivideFailsWhenImplicitConversionDisabled() { TARGET=CMakeFiles/SI-Compilation-Tests.dir/operator_divide_test.cc.o - buildSingleTarget ${TARGET} RESTRICTEDBUILD FAIL + buildSingleTarget ${TARGET} RESTRICTEDBUILD FAIL "testOperatorDivideFailsWhenImplicitConversionDisabled" } testOperatorDivideFromFloatingPointCompilesWhenDefaultInvocation() { TARGET=CMakeFiles/SI-Compilation-Tests.dir/operator_divide_from_floating_point_test.cc.o - buildSingleTarget ${TARGET} DEFAULTBUILD PASS + buildSingleTarget ${TARGET} DEFAULTBUILD PASS "testOperatorDivideFromFloatingPointCompilesWhenDefaultInvocation" } testOperatorDivideFromFloatingPointFailsWhenImplicitConversionDisabled() { TARGET=CMakeFiles/SI-Compilation-Tests.dir/operator_divide_from_floating_point_test.cc.o - buildSingleTarget ${TARGET} RESTRICTEDBUILD FAIL + buildSingleTarget ${TARGET} RESTRICTEDBUILD FAIL "testOperatorDivideFromFloatingPointFailsWhenImplicitConversionDisabled" } testOperatorDivideFromIntegralCompilesWhenDefaultInvocation() { TARGET=CMakeFiles/SI-Compilation-Tests.dir/operator_divide_from_integral_test.cc.o - buildSingleTarget ${TARGET} DEFAULTBUILD PASS + buildSingleTarget ${TARGET} DEFAULTBUILD PASS "testOperatorDivideFromIntegralCompilesWhenDefaultInvocation" } testOperatorDivideFromIntegralFailsWhenImplicitConversionDisabled() { TARGET=CMakeFiles/SI-Compilation-Tests.dir/operator_divide_from_integral_test.cc.o - buildSingleTarget ${TARGET} RESTRICTEDBUILD FAIL + buildSingleTarget ${TARGET} RESTRICTEDBUILD FAIL "testOperatorDivideFromIntegralFailsWhenImplicitConversionDisabled" } testCompilationFailsWhenNumberParserOverflows() { TARGET=CMakeFiles/SI-Compilation-Tests.dir/parsing_overflow_test.cc.o - buildSingleTarget ${TARGET} RESTRICTEDBUILD FAIL + buildSingleTarget ${TARGET} RESTRICTEDBUILD FAIL "testCompilationFailsWhenNumberParserOverflows" } testCompilationSucceedsWhenNumberParserDoesNotOverflow() { TARGET=CMakeFiles/SI-Compilation-Tests.dir/parsing_overflow_test_pass_compilation.cc.o - buildSingleTarget ${TARGET} DEFAULTBUILD PASS + buildSingleTarget ${TARGET} DEFAULTBUILD PASS "testCompilationSucceedsWhenNumberParserDoesNotOverflow" } From 9da42114110c3a894813fa98195f371b8f8a9486 Mon Sep 17 00:00:00 2001 From: Dominik Berner Date: Tue, 11 Feb 2025 22:01:18 +0100 Subject: [PATCH 4/5] Force usage of bash --- .github/workflows/ci.yml | 1 + test/compilation-tests.sh | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 4bc91e42..0fa06bf8 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -117,6 +117,7 @@ jobs: if: runner.os == 'Linux' || runner.os == 'macOs' run: | ./test/compilation-tests.sh + shell: bash version-consistency-check: if: github.event.action == 'published' || github.ref != 'refs/heads/main' diff --git a/test/compilation-tests.sh b/test/compilation-tests.sh index 285773c2..237261a6 100755 --- a/test/compilation-tests.sh +++ b/test/compilation-tests.sh @@ -7,7 +7,6 @@ INSTALL_PATH=$(realpath ~/SI-install) buildSingleTarget() { - set -x if [ "${2}" == "DEFAULTBUILD" ]; then cmake ${ROOT_DIR}/test/src/compilation_tests/ -B${BUILD_DIR} -DCMAKE_PREFIX_PATH=${BUILD_DIR} -DCMAKE_INSTALL_PREFIX:PATH=${INSTALL_PATH} -DCMAKE_BUILD_TYPE=Release -G Ninja > /dev/null assertEquals "Configuration for defaultbuild successful" 0 $? ${3} @@ -25,11 +24,12 @@ buildSingleTarget() else assertNotEquals "Building fails" 0 $RESULT fi - set +x + } oneTimeSetUp(){ + echo "Setting up and installing SI" BUILD_DIR=$(mktemp -d) conan install . --output-folder=${BUILD_DIR} --build=missing --settings=build_type=Release 2>&1> /dev/null From b0378053cc006e9e695cbd67be027bd9362e4618 Mon Sep 17 00:00:00 2001 From: Dominik Berner Date: Tue, 11 Feb 2025 22:10:48 +0100 Subject: [PATCH 5/5] Installing SI into a temp dir --- test/compilation-tests.sh | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/test/compilation-tests.sh b/test/compilation-tests.sh index 237261a6..29af8820 100755 --- a/test/compilation-tests.sh +++ b/test/compilation-tests.sh @@ -3,17 +3,20 @@ SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )" ROOT_DIR=$(realpath ${SCRIPT_DIR}/../) -INSTALL_PATH=$(realpath ~/SI-install) + +# Set the install path +INSTALL_PATH=$(mktemp -d)/SI-install +#INSTALL_PATH=$(realpath ~/SI-install) buildSingleTarget() { if [ "${2}" == "DEFAULTBUILD" ]; then cmake ${ROOT_DIR}/test/src/compilation_tests/ -B${BUILD_DIR} -DCMAKE_PREFIX_PATH=${BUILD_DIR} -DCMAKE_INSTALL_PREFIX:PATH=${INSTALL_PATH} -DCMAKE_BUILD_TYPE=Release -G Ninja > /dev/null - assertEquals "Configuration for defaultbuild successful" 0 $? ${3} + assertEquals "'${4}': Configuration for defaultbuild successful" 0 $? else cmake ${ROOT_DIR}/test/src/compilation_tests/ -B${BUILD_DIR} -DCMAKE_PREFIX_PATH=${BUILD_DIR} -DCMAKE_INSTALL_PREFIX:PATH=${INSTALL_PATH} -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_FLAGS="-DSI_DISABLE_IMPLICIT_RATIO_CONVERSION" -G Ninja > /dev/null - assertEquals "Configuration for build with disabled ration cinversion successful" 0 $? ${3} + assertEquals "'${4}': Configuration for build with disabled ration cinversion successful" 0 $? fi cmake --build ${BUILD_DIR} --config Release --target $1 > /dev/null