aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDylan Baker <dylan@pnwbakers.com>2019-05-07 14:46:30 -0700
committerDylan Baker <dylan@pnwbakers.com>2019-05-10 13:36:35 -0700
commit7d4e3d2589622b1900a740227861c3dc9275846b (patch)
tree030e61cca13c0852517c76607ea0735a94ecb165
parent73d6bde9b6f092aac1317731b3a56f95c5e26a8b (diff)
downloadmeson-7d4e3d2589622b1900a740227861c3dc9275846b.zip
meson-7d4e3d2589622b1900a740227861c3dc9275846b.tar.gz
meson-7d4e3d2589622b1900a740227861c3dc9275846b.tar.bz2
tests/206: Fix intel vs intel-cl expectations
-rw-r--r--test cases/common/206 argument syntax/meson.build10
1 files changed, 2 insertions, 8 deletions
diff --git a/test cases/common/206 argument syntax/meson.build b/test cases/common/206 argument syntax/meson.build
index 216da45..b97ca74 100644
--- a/test cases/common/206 argument syntax/meson.build
+++ b/test cases/common/206 argument syntax/meson.build
@@ -5,16 +5,10 @@ project(
cc = meson.get_compiler('c')
-if ['gcc', 'lcc', 'clang'].contains(cc.get_id())
+if ['gcc', 'lcc', 'clang', 'intel'].contains(cc.get_id())
expected = 'gcc'
-elif ['msvc', 'clang-cl'].contains(cc.get_id())
+elif ['msvc', 'clang-cl', 'intel-cl'].contains(cc.get_id())
expected = 'msvc'
-elif cc.get_id() == 'intel'
- if host_machine.system() == 'windows'
- expected = 'msvc'
- else
- expected = 'gcc'
- endif
else
# It's possible that other compilers end up here that shouldn't
expected = 'other'