diff options
author | Jussi Pakkanen <jpakkane@gmail.com> | 2022-05-03 17:02:15 +0300 |
---|---|---|
committer | Jussi Pakkanen <jpakkane@gmail.com> | 2022-05-03 18:08:53 +0300 |
commit | 9d3ad5a2a90c5471cd3c3ab28d880fa278cd2a97 (patch) | |
tree | d16efda157dcf85be338bd8616a52b53a2633f9d | |
parent | 2f68aa21e87f451196bb050315e268cb38f200c5 (diff) | |
download | meson-9d3ad5a2a90c5471cd3c3ab28d880fa278cd2a97.zip meson-9d3ad5a2a90c5471cd3c3ab28d880fa278cd2a97.tar.gz meson-9d3ad5a2a90c5471cd3c3ab28d880fa278cd2a97.tar.bz2 |
Move Visual Studio module test to its own subdir.
-rw-r--r-- | test cases/unit/85 cpp modules/meson.build | 20 | ||||
-rw-r--r-- | test cases/unit/85 cpp modules/vs/main.cpp (renamed from test cases/unit/85 cpp modules/main.cpp) | 0 | ||||
-rw-r--r-- | test cases/unit/85 cpp modules/vs/meson.build | 15 | ||||
-rw-r--r-- | test cases/unit/85 cpp modules/vs/src0.ixx (renamed from test cases/unit/85 cpp modules/src0.ixx) | 0 | ||||
-rw-r--r-- | test cases/unit/85 cpp modules/vs/src1.ixx (renamed from test cases/unit/85 cpp modules/src1.ixx) | 0 | ||||
-rw-r--r-- | test cases/unit/85 cpp modules/vs/src2.ixx (renamed from test cases/unit/85 cpp modules/src2.ixx) | 0 | ||||
-rw-r--r-- | test cases/unit/85 cpp modules/vs/src3.ixx (renamed from test cases/unit/85 cpp modules/src3.ixx) | 0 | ||||
-rw-r--r-- | test cases/unit/85 cpp modules/vs/src4.ixx (renamed from test cases/unit/85 cpp modules/src4.ixx) | 0 | ||||
-rw-r--r-- | test cases/unit/85 cpp modules/vs/src5.ixx (renamed from test cases/unit/85 cpp modules/src5.ixx) | 0 | ||||
-rw-r--r-- | test cases/unit/85 cpp modules/vs/src6.ixx (renamed from test cases/unit/85 cpp modules/src6.ixx) | 0 | ||||
-rw-r--r-- | test cases/unit/85 cpp modules/vs/src7.ixx (renamed from test cases/unit/85 cpp modules/src7.ixx) | 0 | ||||
-rw-r--r-- | test cases/unit/85 cpp modules/vs/src8.ixx (renamed from test cases/unit/85 cpp modules/src8.ixx) | 0 | ||||
-rw-r--r-- | test cases/unit/85 cpp modules/vs/src9.ixx (renamed from test cases/unit/85 cpp modules/src9.ixx) | 0 |
13 files changed, 21 insertions, 14 deletions
diff --git a/test cases/unit/85 cpp modules/meson.build b/test cases/unit/85 cpp modules/meson.build index cdc296f..3dd5033 100644 --- a/test cases/unit/85 cpp modules/meson.build +++ b/test cases/unit/85 cpp modules/meson.build @@ -1,17 +1,9 @@ project('cppmodules', 'cpp', default_options: ['cpp_std=c++latest']) -e = executable('modtest', - 'main.cpp', - 'src0.ixx', - 'src1.ixx', - 'src2.ixx', - 'src3.ixx', - 'src4.ixx', - 'src5.ixx', - 'src6.ixx', - 'src7.ixx', - 'src8.ixx', - 'src9.ixx', - ) +cpp = meson.get_compiler('cpp') -test('modtest', e) +if cpp.get_id() == 'msvc' + subdir('vs') +else + error('Unknown compiler') +endif diff --git a/test cases/unit/85 cpp modules/main.cpp b/test cases/unit/85 cpp modules/vs/main.cpp index d825c7d..d825c7d 100644 --- a/test cases/unit/85 cpp modules/main.cpp +++ b/test cases/unit/85 cpp modules/vs/main.cpp diff --git a/test cases/unit/85 cpp modules/vs/meson.build b/test cases/unit/85 cpp modules/vs/meson.build new file mode 100644 index 0000000..e3f6b83 --- /dev/null +++ b/test cases/unit/85 cpp modules/vs/meson.build @@ -0,0 +1,15 @@ +e = executable('modtest', + 'main.cpp', + 'src0.ixx', + 'src1.ixx', + 'src2.ixx', + 'src3.ixx', + 'src4.ixx', + 'src5.ixx', + 'src6.ixx', + 'src7.ixx', + 'src8.ixx', + 'src9.ixx', + ) + +test('modtest', e) diff --git a/test cases/unit/85 cpp modules/src0.ixx b/test cases/unit/85 cpp modules/vs/src0.ixx index 3ca4d14..3ca4d14 100644 --- a/test cases/unit/85 cpp modules/src0.ixx +++ b/test cases/unit/85 cpp modules/vs/src0.ixx diff --git a/test cases/unit/85 cpp modules/src1.ixx b/test cases/unit/85 cpp modules/vs/src1.ixx index cea6696..cea6696 100644 --- a/test cases/unit/85 cpp modules/src1.ixx +++ b/test cases/unit/85 cpp modules/vs/src1.ixx diff --git a/test cases/unit/85 cpp modules/src2.ixx b/test cases/unit/85 cpp modules/vs/src2.ixx index 415714c..415714c 100644 --- a/test cases/unit/85 cpp modules/src2.ixx +++ b/test cases/unit/85 cpp modules/vs/src2.ixx diff --git a/test cases/unit/85 cpp modules/src3.ixx b/test cases/unit/85 cpp modules/vs/src3.ixx index 96f135c..96f135c 100644 --- a/test cases/unit/85 cpp modules/src3.ixx +++ b/test cases/unit/85 cpp modules/vs/src3.ixx diff --git a/test cases/unit/85 cpp modules/src4.ixx b/test cases/unit/85 cpp modules/vs/src4.ixx index 1ac1a6a..1ac1a6a 100644 --- a/test cases/unit/85 cpp modules/src4.ixx +++ b/test cases/unit/85 cpp modules/vs/src4.ixx diff --git a/test cases/unit/85 cpp modules/src5.ixx b/test cases/unit/85 cpp modules/vs/src5.ixx index 96cf707..96cf707 100644 --- a/test cases/unit/85 cpp modules/src5.ixx +++ b/test cases/unit/85 cpp modules/vs/src5.ixx diff --git a/test cases/unit/85 cpp modules/src6.ixx b/test cases/unit/85 cpp modules/vs/src6.ixx index 760b71c..760b71c 100644 --- a/test cases/unit/85 cpp modules/src6.ixx +++ b/test cases/unit/85 cpp modules/vs/src6.ixx diff --git a/test cases/unit/85 cpp modules/src7.ixx b/test cases/unit/85 cpp modules/vs/src7.ixx index 8ce6608..8ce6608 100644 --- a/test cases/unit/85 cpp modules/src7.ixx +++ b/test cases/unit/85 cpp modules/vs/src7.ixx diff --git a/test cases/unit/85 cpp modules/src8.ixx b/test cases/unit/85 cpp modules/vs/src8.ixx index 6a3ef96..6a3ef96 100644 --- a/test cases/unit/85 cpp modules/src8.ixx +++ b/test cases/unit/85 cpp modules/vs/src8.ixx diff --git a/test cases/unit/85 cpp modules/src9.ixx b/test cases/unit/85 cpp modules/vs/src9.ixx index 3ecb3be..3ecb3be 100644 --- a/test cases/unit/85 cpp modules/src9.ixx +++ b/test cases/unit/85 cpp modules/vs/src9.ixx |