Merge branch 'disable-tests' into 'master'

Temporarily disable flaky tests

See merge request GNOME/glib!579
This commit is contained in:
Philip Withnall
2019-01-15 16:45:15 +00:00
4 changed files with 10 additions and 10 deletions

View File

@@ -34,7 +34,7 @@ fedora-x86_64:
- ninja -C _build - ninja -C _build
- mkdir -p _coverage - mkdir -p _coverage
- lcov --config-file .gitlab-ci/lcovrc --directory _build --capture --initial --output-file "_coverage/${CI_JOB_NAME}-baseline.lcov" - lcov --config-file .gitlab-ci/lcovrc --directory _build --capture --initial --output-file "_coverage/${CI_JOB_NAME}-baseline.lcov"
- meson test -C _build --timeout-multiplier ${MESON_TEST_TIMEOUT_MULTIPLIER} - meson test -C _build --timeout-multiplier ${MESON_TEST_TIMEOUT_MULTIPLIER} --no-suite flaky
- lcov --config-file .gitlab-ci/lcovrc --directory _build --capture --output-file "_coverage/${CI_JOB_NAME}.lcov" - lcov --config-file .gitlab-ci/lcovrc --directory _build --capture --output-file "_coverage/${CI_JOB_NAME}.lcov"
# FIXME: We should run all installed tests, but do only this one for now # FIXME: We should run all installed tests, but do only this one for now
# because it cannot run uninstalled. Reconfigure with dtrace disabled # because it cannot run uninstalled. Reconfigure with dtrace disabled
@@ -142,7 +142,7 @@ freebsd-11-x86_64:
# FIXME: extattr(2) support: https://gitlab.gnome.org/GNOME/glib/issues/1404 # FIXME: extattr(2) support: https://gitlab.gnome.org/GNOME/glib/issues/1404
- meson ${MESON_COMMON_OPTIONS} -Db_lundef=false -Diconv=gnu -Dxattr=false _build - meson ${MESON_COMMON_OPTIONS} -Db_lundef=false -Diconv=gnu -Dxattr=false _build
- ninja -C _build - ninja -C _build
- meson test -C _build --timeout-multiplier "${MESON_TEST_TIMEOUT_MULTIPLIER}" - meson test -C _build --timeout-multiplier "${MESON_TEST_TIMEOUT_MULTIPLIER}" --no-suite flaky
except: except:
- tags - tags
artifacts: artifacts:

View File

@@ -10,7 +10,7 @@ meson _build || goto :error
ninja -C _build || goto :error ninja -C _build || goto :error
:: FIXME: dont ignore test errors :: FIXME: dont ignore test errors
meson test -C _build --timeout-multiplier %MESON_TEST_TIMEOUT_MULTIPLIER% meson test -C _build --timeout-multiplier %MESON_TEST_TIMEOUT_MULTIPLIER% --no-suite flaky
:: FIXME: can we get code coverage support? :: FIXME: can we get code coverage support?

View File

@@ -51,7 +51,7 @@ ninja
--output-file "${DIR}/_coverage/${CI_JOB_NAME}-baseline.lcov" --output-file "${DIR}/_coverage/${CI_JOB_NAME}-baseline.lcov"
# FIXME: fix the test suite # FIXME: fix the test suite
meson test --timeout-multiplier ${MESON_TEST_TIMEOUT_MULTIPLIER} || true meson test --timeout-multiplier ${MESON_TEST_TIMEOUT_MULTIPLIER} --no-suite flaky || true
"${LCOV}" \ "${LCOV}" \
--quiet \ --quiet \

View File

@@ -55,7 +55,7 @@ gio_tests = {
'memory-output-stream' : {}, 'memory-output-stream' : {},
'monitor' : {}, 'monitor' : {},
'mount-operation' : {}, 'mount-operation' : {},
'network-address' : {'extra_sources': ['mock-resolver.c']}, 'network-address' : {'extra_sources': ['mock-resolver.c'], 'suite': ['flaky']},
'network-monitor' : {}, 'network-monitor' : {},
'network-monitor-race' : {}, 'network-monitor-race' : {},
'permission' : {}, 'permission' : {},
@@ -73,7 +73,7 @@ gio_tests = {
'vfs' : {}, 'vfs' : {},
'volumemonitor' : {}, 'volumemonitor' : {},
'glistmodel' : {}, 'glistmodel' : {},
'testfilemonitor' : {'suite' : ['slow']}, 'testfilemonitor' : {'suite' : ['slow', 'flaky']},
'thumbnail-verification' : {}, 'thumbnail-verification' : {},
'tls-certificate' : {'extra_sources' : ['gtesttlsbackend.c']}, 'tls-certificate' : {'extra_sources' : ['gtesttlsbackend.c']},
'tls-interaction' : {'extra_sources' : ['gtesttlsbackend.c']}, 'tls-interaction' : {'extra_sources' : ['gtesttlsbackend.c']},
@@ -236,10 +236,10 @@ if host_machine.system() != 'windows'
'extra_sources' : extra_sources, 'extra_sources' : extra_sources,
'suite' : ['slow'], 'suite' : ['slow'],
}, },
'gdbus-auth' : {'extra_sources' : extra_sources}, 'gdbus-auth' : {'extra_sources' : extra_sources, 'suite': ['flaky']},
'gdbus-bz627724' : {'extra_sources' : extra_sources}, 'gdbus-bz627724' : {'extra_sources' : extra_sources, 'suite': ['flaky']},
'gdbus-close-pending' : {'extra_sources' : extra_sources}, 'gdbus-close-pending' : {'extra_sources' : extra_sources},
'gdbus-connection' : {'extra_sources' : extra_sources}, 'gdbus-connection' : {'extra_sources' : extra_sources, 'suite': ['flaky']},
'gdbus-connection-loss' : {'extra_sources' : extra_sources}, 'gdbus-connection-loss' : {'extra_sources' : extra_sources},
'gdbus-connection-slow' : {'extra_sources' : extra_sources}, 'gdbus-connection-slow' : {'extra_sources' : extra_sources},
'gdbus-error' : {'extra_sources' : extra_sources}, 'gdbus-error' : {'extra_sources' : extra_sources},
@@ -262,7 +262,7 @@ if host_machine.system() != 'windows'
}, },
'gdbus-threading' : { 'gdbus-threading' : {
'extra_sources' : extra_sources, 'extra_sources' : extra_sources,
'suite' : ['slow'], 'suite' : ['slow', 'flaky'],
}, },
'gmenumodel' : { 'gmenumodel' : {
'extra_sources' : extra_sources, 'extra_sources' : extra_sources,