Skip to content

Commit 13bd57a

Browse files
Use cmake for cleaning in cmake job
which makes more sense than building with cmake and cleaning with make.
1 parent e3fdb1e commit 13bd57a

File tree

3 files changed

+22
-5
lines changed

3 files changed

+22
-5
lines changed

Diff for: .github/workflows/pull-request-checks.yaml

+1-5
Original file line numberDiff line numberDiff line change
@@ -263,11 +263,7 @@ jobs:
263263
run: cd build; ctest . -V -L CORE -j${{env.linux-vcpus}}
264264
- name: Check cleanup
265265
run: |
266-
rm -r build
267-
rm scripts/bash-autocomplete/cbmc.sh
268-
make -C unit clean
269-
make -C regression clean
270-
make -C jbmc/regression clean
266+
cmake --build build --target clean
271267
if [[ $(git status --ignored --porcelain | grep -v .ccache/) ]] ; then
272268
git status --ignored
273269
exit 1

Diff for: jbmc/CMakeLists.txt

+8
Original file line numberDiff line numberDiff line change
@@ -56,3 +56,11 @@ add_custom_command(OUTPUT ${java_regression_compiled_sources}
5656
add_custom_target(java-regression ALL
5757
DEPENDS ${java_regression_compiled_sources}
5858
)
59+
60+
# Clean up
61+
file(GLOB_RECURSE out_files "regression/**/*.out")
62+
file(GLOB_RECURSE goto_binary_files "regression/**/*.gb")
63+
set_property(
64+
TARGET java-regression
65+
APPEND
66+
PROPERTY ADDITIONAL_CLEAN_FILES ${java_regression_compiled_sources} ${out_files} ${goto_binary_files} regression/tests.log regression/tests-symex-driven-loading.log)

Diff for: regression/CMakeLists.txt

+13
Original file line numberDiff line numberDiff line change
@@ -99,3 +99,16 @@ if(WITH_MEMORY_ANALYZER)
9999
add_subdirectory(memory-analyzer)
100100
add_subdirectory(extract_type_header)
101101
endif()
102+
103+
# Clean up
104+
add_custom_target(cbmc-regression ALL)
105+
106+
add_dependencies(cbmc cbmc-regression)
107+
108+
file(GLOB_RECURSE out_files "**/*.out")
109+
file(GLOB_RECURSE solver_files "**/*.dimacs,**/*.json")
110+
file(GLOB_RECURSE goto_binary_files "**/*.gb,**/*.goto")
111+
set_property(
112+
TARGET cbmc-regression
113+
APPEND
114+
PROPERTY ADDITIONAL_CLEAN_FILES ${out_files} ${goto_binary_files} ${solver_files} tests.log)

0 commit comments

Comments
 (0)