Skip to content

Commit 6d4e3b4

Browse files
committed
fix gqt gui option and checking log dir existence
1 parent 687ce7d commit 6d4e3b4

2 files changed

Lines changed: 9 additions & 3 deletions

File tree

.github/workflows/docker.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -249,13 +249,14 @@ jobs:
249249
echo "## Tests"
250250
echo ""
251251
252-
TEST_LOG="${{ runner.temp }}/artifacts/${{ matrix.logs_dir }}/logs/test.log"
252+
TEST_DIR=${{ runner.temp }}/artifacts/${{ matrix.logs_dir }}
253+
TEST_LOG="$TEST_DIR/logs/test.log"
253254
254255
if [[ -f "$TEST_LOG" ]]; then
255256
echo '```'
256257
# Always include the final Ok/Fail lines
257258
OK_FAIL="$(tail -n 2 "$TEST_LOG")"
258-
259+
ls -lR "$TEST_DIR"
259260
# If there is a "Summary of Failures:" section, include it (without duplicating Ok/Fail)
260261
if grep -q '^Summary of Failures:' "$TEST_LOG"; then
261262
# Print from "Summary of Failures:" up to the line before "Ok:"

gqtbuttonswidget/meson.build

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
11
sub_dir_name = meson.current_source_dir().split('/').get(-1)
22
internal_deps = ['goptions', 'guts', 'glogging']
33

4+
with_gui = ['']
5+
if get_option('i_test')
6+
with_gui = ['-gui']
7+
endif
8+
49
sources = files(
510
'gQtButtonsWidget.cc',
611
)
@@ -18,7 +23,7 @@ qrc_examples_sources = files(
1823
)
1924

2025
examples = {
21-
'test_gqtbuttons_widget' : [files('examples/gqtbuttons_example.cc'), ['-gui']],
26+
'test_gqtbuttons_widget' : [files('examples/gqtbuttons_example.cc'), with_gui],
2227
}
2328

2429
LD += {

0 commit comments

Comments
 (0)