Skip to content

Commit a36e89a

Browse files
authored
Merge pull request borglab#2234 from talregev/TalR/gtsam_unstable
Add gtsam unstable tests in vcpkg
2 parents 6825f7d + f07b261 commit a36e89a

File tree

2 files changed

+13
-5
lines changed

2 files changed

+13
-5
lines changed

.github/workflows/vcpkg.yml

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,12 +37,18 @@ jobs:
3737
test_target: test
3838
binary_cache: /home/runner/.cache/vcpkg/archives
3939
python: python3
40+
# vcpkg compile external metis, while test are configured to use vendored metis.
41+
# Need to debug and fix it.
42+
ctest_extra_flags: -E "testFindSeparator"
4043
- os: macos-latest
4144
triplet: arm64-osx-release
4245
build_type: Release
4346
test_target: test
4447
binary_cache: /Users/runner/.cache/vcpkg/archives
4548
python: python3
49+
# vcpkg compile external metis, while test are configured to use vendored metis.
50+
# Need to debug and fix it.
51+
ctest_extra_flags: -E "testFindSeparator"
4652
steps:
4753
- name: Checkout
4854
uses: actions/checkout@v4
@@ -137,13 +143,13 @@ jobs:
137143
-DVCPKG_INSTALLED_DIR=$VCPKG_INSTALLATION_ROOT/installed \
138144
-DVCPKG_TARGET_TRIPLET=${{ matrix.triplet }} \
139145
-DVCPKG_HOST_TRIPLET=${{ matrix.triplet }} \
140-
-DCMAKE_BUILD_TYPE=Release \
146+
-DCMAKE_BUILD_TYPE=${{ matrix.build_type }} \
141147
-DGTSAM_BUILD_EXAMPLES_ALWAYS=ON \
142148
-DGTSAM_ROT3_EXPMAP=ON \
143149
-DGTSAM_POSE3_EXPMAP=ON \
144150
-DGTSAM_BUILD_PYTHON=ON \
145151
-DGTSAM_BUILD_TESTS=ON \
146-
-DGTSAM_BUILD_UNSTABLE=OFF \
152+
-DGTSAM_BUILD_UNSTABLE=ON \
147153
-DGTSAM_ALLOW_DEPRECATED_SINCE_V43=OFF \
148154
-DGTSAM_USE_SYSTEM_EIGEN=ON \
149155
-DGTSAM_USE_SYSTEM_METIS=ON \
@@ -155,15 +161,17 @@ jobs:
155161
- name: cmake build
156162
shell: bash
157163
run: |
158-
cmake --build build --config Release
164+
cmake --build build --config ${{ matrix.build_type }}
159165
160166
- name: Run Python tests
161167
shell: bash
162168
run: |
169+
export PATH="$PATH:$VCPKG_INSTALLATION_ROOT/installed/${{ matrix.triplet }}/bin"
163170
cmake --build build --target python-install
164171
cmake --build build --target python-test
172+
cmake --build build --target python-test-unstable
165173
166174
- name: Run tests
167175
shell: bash
168176
run: |
169-
cmake --build build --target check
177+
cmake --build build --config ${{ matrix.build_type }} --target check

gtsam_unstable/discrete/tests/testScheduler.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ DiscreteFactorGraph createExpected() {
6969
// Mutual exclusion for students
7070
expected.addAllDiff(A, J);
7171

72-
return std::move(expected);
72+
return expected;
7373
}
7474

7575
/* ************************************************************************* */

0 commit comments

Comments
 (0)