Commit 8a9999b7 authored by Hugo Beauzée-Luyssen's avatar Hugo Beauzée-Luyssen
Browse files

Revert "TMP: Use a custom meson fork to display failed tests stacktrace"

This reverts commit 6fbf7be6.
This reverts commit 79fa641e.
Fix #363
parent 363bb8fc
Pipeline #135392 passed with stage
in 5 minutes and 36 seconds
...@@ -17,12 +17,9 @@ linux: ...@@ -17,12 +17,9 @@ linux:
- docker - docker
- amd64 - amd64
script: script:
- cd /tmp/ && git clone --single-branch --branch=display_stack_on_timeout --depth=1 https://github.com/chouquette/meson - meson -Db_coverage=true build
- export PATH=/tmp/meson:$PATH
- cd $CI_PROJECT_DIR
- meson.py -Db_coverage=true build
- cd build && ninja - cd build && ninja
- meson.py test --no-stdsplit - meson test --no-stdsplit
- mkdir html/ - mkdir html/
- > - >
gcovr -r "$CI_PROJECT_DIR/" gcovr -r "$CI_PROJECT_DIR/"
...@@ -150,12 +147,10 @@ asan-ubsan: ...@@ -150,12 +147,10 @@ asan-ubsan:
- ./configure LDFLAGS="-lasan -lubsan" --prefix=$(pwd)/prefix --disable-qt --with-sanitizer=address,undefined --disable-medialibrary --disable-nls --enable-debug - ./configure LDFLAGS="-lasan -lubsan" --prefix=$(pwd)/prefix --disable-qt --with-sanitizer=address,undefined --disable-medialibrary --disable-nls --enable-debug
- make install -j8 - make install -j8
- export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:$(pwd)/prefix/lib/pkgconfig" - export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:$(pwd)/prefix/lib/pkgconfig"
- cd /tmp/ && git clone --single-branch --branch=display_stack_on_timeout --depth=1 https://github.com/chouquette/meson - cd ..
- export PATH=/tmp/meson:$PATH - meson -Db_sanitize=address,undefined build
- cd $CI_PROJECT_DIR - cd build && meson test --no-stdsplit
- meson.py -Db_sanitize=address,undefined build - meson compile fast_discover_cancel fast_teardown
- cd build && meson.py test --no-stdsplit
- meson.py compile fast_discover_cancel fast_teardown
- ./test/fast_teardown/fast_teardown $CI_PROJECT_DIR/test/samples/samples - ./test/fast_teardown/fast_teardown $CI_PROJECT_DIR/test/samples/samples
- ./test/fast_discover_cancel/fast_discover_cancel $CI_PROJECT_DIR/test/samples/samples - ./test/fast_discover_cancel/fast_discover_cancel $CI_PROJECT_DIR/test/samples/samples
artifacts: artifacts:
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment