diff options
Diffstat (limited to 'tests/projects/c++')
| -rw-r--r-- | tests/projects/c++/modules/class/test.lua | 8 | ||||
| -rw-r--r-- | tests/projects/c++/modules/cpp_with_moduledeps/test.lua | 8 | ||||
| -rw-r--r-- | tests/projects/c++/modules/dependence/test.lua | 8 | ||||
| -rw-r--r-- | tests/projects/c++/modules/dependence2/test.lua | 8 | ||||
| -rw-r--r-- | tests/projects/c++/modules/hello with spaces/test.lua | 8 | ||||
| -rw-r--r-- | tests/projects/c++/modules/hello/test.lua | 8 | ||||
| -rw-r--r-- | tests/projects/c++/modules/impl_unit/test.lua | 8 | ||||
| -rw-r--r-- | tests/projects/c++/modules/inline_and_template/test.lua | 8 | ||||
| -rw-r--r-- | tests/projects/c++/modules/staticlib/test.lua | 8 | ||||
| -rw-r--r-- | tests/projects/c++/modules/submodules/test.lua | 8 | ||||
| -rw-r--r-- | tests/projects/c++/modules/submodules2/test.lua | 8 |
11 files changed, 55 insertions, 33 deletions
diff --git a/tests/projects/c++/modules/class/test.lua b/tests/projects/c++/modules/class/test.lua index 76b141d6b..b2cc5b3da 100644 --- a/tests/projects/c++/modules/class/test.lua +++ b/tests/projects/c++/modules/class/test.lua @@ -5,13 +5,15 @@ function main(t) local test = false if is_subhost("windows") then test = true - elseif is_host("linux", "macosx") then + elseif is_host("linux") then local gcc = find_tool("gcc", {version = true}) + if gcc and gcc.version and semver.compare(gcc.version, "11.0") >= 0 then + test = true + end + elseif is_host("macosx") then local clang = find_tool("clang", {version = true}) if clang and clang.version and semver.compare(clang.version, "14.0") >= 0 then test = true - elseif gcc and gcc.version and semver.compare(gcc.version, "11.0") >= 0 then - test = true end end if test then diff --git a/tests/projects/c++/modules/cpp_with_moduledeps/test.lua b/tests/projects/c++/modules/cpp_with_moduledeps/test.lua index 76b141d6b..b2cc5b3da 100644 --- a/tests/projects/c++/modules/cpp_with_moduledeps/test.lua +++ b/tests/projects/c++/modules/cpp_with_moduledeps/test.lua @@ -5,13 +5,15 @@ function main(t) local test = false if is_subhost("windows") then test = true - elseif is_host("linux", "macosx") then + elseif is_host("linux") then local gcc = find_tool("gcc", {version = true}) + if gcc and gcc.version and semver.compare(gcc.version, "11.0") >= 0 then + test = true + end + elseif is_host("macosx") then local clang = find_tool("clang", {version = true}) if clang and clang.version and semver.compare(clang.version, "14.0") >= 0 then test = true - elseif gcc and gcc.version and semver.compare(gcc.version, "11.0") >= 0 then - test = true end end if test then diff --git a/tests/projects/c++/modules/dependence/test.lua b/tests/projects/c++/modules/dependence/test.lua index 76b141d6b..b2cc5b3da 100644 --- a/tests/projects/c++/modules/dependence/test.lua +++ b/tests/projects/c++/modules/dependence/test.lua @@ -5,13 +5,15 @@ function main(t) local test = false if is_subhost("windows") then test = true - elseif is_host("linux", "macosx") then + elseif is_host("linux") then local gcc = find_tool("gcc", {version = true}) + if gcc and gcc.version and semver.compare(gcc.version, "11.0") >= 0 then + test = true + end + elseif is_host("macosx") then local clang = find_tool("clang", {version = true}) if clang and clang.version and semver.compare(clang.version, "14.0") >= 0 then test = true - elseif gcc and gcc.version and semver.compare(gcc.version, "11.0") >= 0 then - test = true end end if test then diff --git a/tests/projects/c++/modules/dependence2/test.lua b/tests/projects/c++/modules/dependence2/test.lua index 76b141d6b..b2cc5b3da 100644 --- a/tests/projects/c++/modules/dependence2/test.lua +++ b/tests/projects/c++/modules/dependence2/test.lua @@ -5,13 +5,15 @@ function main(t) local test = false if is_subhost("windows") then test = true - elseif is_host("linux", "macosx") then + elseif is_host("linux") then local gcc = find_tool("gcc", {version = true}) + if gcc and gcc.version and semver.compare(gcc.version, "11.0") >= 0 then + test = true + end + elseif is_host("macosx") then local clang = find_tool("clang", {version = true}) if clang and clang.version and semver.compare(clang.version, "14.0") >= 0 then test = true - elseif gcc and gcc.version and semver.compare(gcc.version, "11.0") >= 0 then - test = true end end if test then diff --git a/tests/projects/c++/modules/hello with spaces/test.lua b/tests/projects/c++/modules/hello with spaces/test.lua index 76b141d6b..b2cc5b3da 100644 --- a/tests/projects/c++/modules/hello with spaces/test.lua +++ b/tests/projects/c++/modules/hello with spaces/test.lua @@ -5,13 +5,15 @@ function main(t) local test = false if is_subhost("windows") then test = true - elseif is_host("linux", "macosx") then + elseif is_host("linux") then local gcc = find_tool("gcc", {version = true}) + if gcc and gcc.version and semver.compare(gcc.version, "11.0") >= 0 then + test = true + end + elseif is_host("macosx") then local clang = find_tool("clang", {version = true}) if clang and clang.version and semver.compare(clang.version, "14.0") >= 0 then test = true - elseif gcc and gcc.version and semver.compare(gcc.version, "11.0") >= 0 then - test = true end end if test then diff --git a/tests/projects/c++/modules/hello/test.lua b/tests/projects/c++/modules/hello/test.lua index 76b141d6b..b2cc5b3da 100644 --- a/tests/projects/c++/modules/hello/test.lua +++ b/tests/projects/c++/modules/hello/test.lua @@ -5,13 +5,15 @@ function main(t) local test = false if is_subhost("windows") then test = true - elseif is_host("linux", "macosx") then + elseif is_host("linux") then local gcc = find_tool("gcc", {version = true}) + if gcc and gcc.version and semver.compare(gcc.version, "11.0") >= 0 then + test = true + end + elseif is_host("macosx") then local clang = find_tool("clang", {version = true}) if clang and clang.version and semver.compare(clang.version, "14.0") >= 0 then test = true - elseif gcc and gcc.version and semver.compare(gcc.version, "11.0") >= 0 then - test = true end end if test then diff --git a/tests/projects/c++/modules/impl_unit/test.lua b/tests/projects/c++/modules/impl_unit/test.lua index 76b141d6b..b2cc5b3da 100644 --- a/tests/projects/c++/modules/impl_unit/test.lua +++ b/tests/projects/c++/modules/impl_unit/test.lua @@ -5,13 +5,15 @@ function main(t) local test = false if is_subhost("windows") then test = true - elseif is_host("linux", "macosx") then + elseif is_host("linux") then local gcc = find_tool("gcc", {version = true}) + if gcc and gcc.version and semver.compare(gcc.version, "11.0") >= 0 then + test = true + end + elseif is_host("macosx") then local clang = find_tool("clang", {version = true}) if clang and clang.version and semver.compare(clang.version, "14.0") >= 0 then test = true - elseif gcc and gcc.version and semver.compare(gcc.version, "11.0") >= 0 then - test = true end end if test then diff --git a/tests/projects/c++/modules/inline_and_template/test.lua b/tests/projects/c++/modules/inline_and_template/test.lua index 76b141d6b..b2cc5b3da 100644 --- a/tests/projects/c++/modules/inline_and_template/test.lua +++ b/tests/projects/c++/modules/inline_and_template/test.lua @@ -5,13 +5,15 @@ function main(t) local test = false if is_subhost("windows") then test = true - elseif is_host("linux", "macosx") then + elseif is_host("linux") then local gcc = find_tool("gcc", {version = true}) + if gcc and gcc.version and semver.compare(gcc.version, "11.0") >= 0 then + test = true + end + elseif is_host("macosx") then local clang = find_tool("clang", {version = true}) if clang and clang.version and semver.compare(clang.version, "14.0") >= 0 then test = true - elseif gcc and gcc.version and semver.compare(gcc.version, "11.0") >= 0 then - test = true end end if test then diff --git a/tests/projects/c++/modules/staticlib/test.lua b/tests/projects/c++/modules/staticlib/test.lua index 76b141d6b..b2cc5b3da 100644 --- a/tests/projects/c++/modules/staticlib/test.lua +++ b/tests/projects/c++/modules/staticlib/test.lua @@ -5,13 +5,15 @@ function main(t) local test = false if is_subhost("windows") then test = true - elseif is_host("linux", "macosx") then + elseif is_host("linux") then local gcc = find_tool("gcc", {version = true}) + if gcc and gcc.version and semver.compare(gcc.version, "11.0") >= 0 then + test = true + end + elseif is_host("macosx") then local clang = find_tool("clang", {version = true}) if clang and clang.version and semver.compare(clang.version, "14.0") >= 0 then test = true - elseif gcc and gcc.version and semver.compare(gcc.version, "11.0") >= 0 then - test = true end end if test then diff --git a/tests/projects/c++/modules/submodules/test.lua b/tests/projects/c++/modules/submodules/test.lua index 76b141d6b..b2cc5b3da 100644 --- a/tests/projects/c++/modules/submodules/test.lua +++ b/tests/projects/c++/modules/submodules/test.lua @@ -5,13 +5,15 @@ function main(t) local test = false if is_subhost("windows") then test = true - elseif is_host("linux", "macosx") then + elseif is_host("linux") then local gcc = find_tool("gcc", {version = true}) + if gcc and gcc.version and semver.compare(gcc.version, "11.0") >= 0 then + test = true + end + elseif is_host("macosx") then local clang = find_tool("clang", {version = true}) if clang and clang.version and semver.compare(clang.version, "14.0") >= 0 then test = true - elseif gcc and gcc.version and semver.compare(gcc.version, "11.0") >= 0 then - test = true end end if test then diff --git a/tests/projects/c++/modules/submodules2/test.lua b/tests/projects/c++/modules/submodules2/test.lua index 76b141d6b..b2cc5b3da 100644 --- a/tests/projects/c++/modules/submodules2/test.lua +++ b/tests/projects/c++/modules/submodules2/test.lua @@ -5,13 +5,15 @@ function main(t) local test = false if is_subhost("windows") then test = true - elseif is_host("linux", "macosx") then + elseif is_host("linux") then local gcc = find_tool("gcc", {version = true}) + if gcc and gcc.version and semver.compare(gcc.version, "11.0") >= 0 then + test = true + end + elseif is_host("macosx") then local clang = find_tool("clang", {version = true}) if clang and clang.version and semver.compare(clang.version, "14.0") >= 0 then test = true - elseif gcc and gcc.version and semver.compare(gcc.version, "11.0") >= 0 then - test = true end end if test then |
