diff options
| author | Jari Karppinen <jari.karppinen@qt.io> | 2019-06-11 14:12:35 +0300 |
|---|---|---|
| committer | Jari Karppinen <jari.karppinen@qt.io> | 2019-06-12 12:45:37 +0300 |
| commit | 255602174d33c838e91b1967443abc637dd856b3 (patch) | |
| tree | 5416ee43cc7e9a2c7fa0b7baaeab7206da071fd6 | |
| parent | b7dc81ae6437c7cb2470b14dbf45c3fea482aafa (diff) | |
Fix regex in ogl-runtime target check for INTEGRITY_DIR
Also temporarily disable tests.
Change-Id: I5abd1702542368fda81a683326816b9fe2cd16ff
Reviewed-by: Antti Määttä <antti.maatta@qt.io>
| -rw-r--r-- | ogl-runtime.pro | 4 | ||||
| -rw-r--r-- | tests/auto/auto.pro | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/ogl-runtime.pro b/ogl-runtime.pro index e7d061a..18be6a1 100644 --- a/ogl-runtime.pro +++ b/ogl-runtime.pro @@ -5,7 +5,9 @@ requires(!watchos) requires(!winrt) requires(!wasm) -ios|qnx|tvos|watchos|winrt|wasm|*-icc*|!contains(INTEGRITY_DIR, *int1144$) { +INTEGRITY_DIR = $$(INTEGRITY_DIR) + +ios|qnx|tvos|watchos|winrt|wasm|*-icc*|contains(INTEGRITY_DIR, .*int1144$) { message("WARNING, target not supported by ogl-runtime") #Exclude non-working cross-compile targets, see: # QT3DS-3645 ogl-runtime doesn't compile on INTEGRITY_11_04 in CI diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro index 2f410f5..9c21cc1 100644 --- a/tests/auto/auto.pro +++ b/tests/auto/auto.pro @@ -1,8 +1,8 @@ TEMPLATE = subdirs CONFIG += ordered -!macos:!win32: SUBDIRS += \ - qtextras +#!macos:!win32: SUBDIRS += \ +# qtextras # TODO: Re-enable these tests after confirming CI can build & run them # runtime \ |