aboutsummaryrefslogtreecommitdiff
path: root/ci
diff options
context:
space:
mode:
authorJon Turney <jon.turney@dronecode.org.uk>2021-06-21 14:06:45 +0100
committerDaniel Mensinger <daniel@mensinger-ka.de>2021-07-07 20:08:12 +0200
commit609864a66ddc6af559fadadd76a266d64ae9991e (patch)
tree6c26994e54ebd407bb6ad5d48245573e5e70a262 /ci
parent0cd8897189b3d68d500ffcd3f32e0f855ac04337 (diff)
downloadmeson-609864a66ddc6af559fadadd76a266d64ae9991e.zip
meson-609864a66ddc6af559fadadd76a266d64ae9991e.tar.gz
meson-609864a66ddc6af559fadadd76a266d64ae9991e.tar.bz2
Annotate framework tests with where they are expected to skip
Remove hard-coded framework test skip logic in skippable(), instead annotate test.json with environments in which skip is expected. (Mainly this is done with by testing the value of MESON_CI_JOBNAME now set for linux jobs)
Diffstat (limited to 'ci')
-rw-r--r--ci/ciimage/bionic/image.json1
-rw-r--r--ci/ciimage/fedora/image.json1
-rw-r--r--ci/ciimage/opensuse/image.json1
3 files changed, 0 insertions, 3 deletions
diff --git a/ci/ciimage/bionic/image.json b/ci/ciimage/bionic/image.json
index 6a3d723..d400902 100644
--- a/ci/ciimage/bionic/image.json
+++ b/ci/ciimage/bionic/image.json
@@ -2,7 +2,6 @@
"base_image": "ubuntu:bionic",
"env": {
"CI": "1",
- "SKIP_SCIENTIFIC": "1",
"DC": "gdc"
}
}
diff --git a/ci/ciimage/fedora/image.json b/ci/ciimage/fedora/image.json
index ae9ff4f..ee96980 100644
--- a/ci/ciimage/fedora/image.json
+++ b/ci/ciimage/fedora/image.json
@@ -2,7 +2,6 @@
"base_image": "fedora:latest",
"env": {
"CI": "1",
- "SKIP_SCIENTIFIC": "1",
"SKIP_STATIC_BOOST": "1"
}
}
diff --git a/ci/ciimage/opensuse/image.json b/ci/ciimage/opensuse/image.json
index 74acbe5..a5e6d1a 100644
--- a/ci/ciimage/opensuse/image.json
+++ b/ci/ciimage/opensuse/image.json
@@ -2,7 +2,6 @@
"base_image": "opensuse/tumbleweed:latest",
"env": {
"CI": "1",
- "SKIP_SCIENTIFIC": "1",
"SKIP_STATIC_BOOST": "1",
"SINGLE_DUB_COMPILER": "1"
}