From 0cd2a8dc002ee83335a2f17b9eaf980152d24864 Mon Sep 17 00:00:00 2001 From: Jussi Pakkanen Date: Mon, 26 Feb 2024 01:08:00 +0200 Subject: Condense directory names for RC1. --- test cases/common/273 environment/meson.build | 50 ---------------------- test cases/common/273 environment/testenv.py | 12 ------ test cases/common/274 environment/meson.build | 50 ++++++++++++++++++++++ test cases/common/274 environment/testenv.py | 12 ++++++ test cases/failing build/1 hidden symbol/bob.c | 5 +++ test cases/failing build/1 hidden symbol/bob.h | 3 ++ test cases/failing build/1 hidden symbol/bobuser.c | 5 +++ .../failing build/1 hidden symbol/meson.build | 11 +++++ test cases/failing build/2 hidden symbol/bob.c | 5 --- test cases/failing build/2 hidden symbol/bob.h | 3 -- test cases/failing build/2 hidden symbol/bobuser.c | 5 --- .../failing build/2 hidden symbol/meson.build | 11 ----- .../failing build/2 pch disabled/c/meson.build | 2 + .../failing build/2 pch disabled/c/pch/prog.h | 1 + .../failing build/2 pch disabled/c/pch/prog_pch.c | 5 +++ test cases/failing build/2 pch disabled/c/prog.c | 9 ++++ .../failing build/2 pch disabled/meson.build | 5 +++ .../3 cmake subproject isolation/incDir/fileA.hpp | 3 ++ .../3 cmake subproject isolation/main.cpp | 10 +++++ .../3 cmake subproject isolation/meson.build | 17 ++++++++ .../subprojects/cmMod/CMakeLists.txt | 10 +++++ .../subprojects/cmMod/cmMod.cpp | 12 ++++++ .../subprojects/cmMod/cmMod.hpp | 14 ++++++ .../3 cmake subproject isolation/test.json | 5 +++ .../failing build/3 pch disabled/c/meson.build | 2 - .../failing build/3 pch disabled/c/pch/prog.h | 1 - .../failing build/3 pch disabled/c/pch/prog_pch.c | 5 --- test cases/failing build/3 pch disabled/c/prog.c | 9 ---- .../failing build/3 pch disabled/meson.build | 5 --- .../4 cmake subproject isolation/incDir/fileA.hpp | 3 -- .../4 cmake subproject isolation/main.cpp | 10 ----- .../4 cmake subproject isolation/meson.build | 17 -------- .../subprojects/cmMod/CMakeLists.txt | 10 ----- .../subprojects/cmMod/cmMod.cpp | 12 ------ .../subprojects/cmMod/cmMod.hpp | 14 ------ .../4 cmake subproject isolation/test.json | 5 --- test cases/failing build/4 failed pickled/false.py | 4 ++ .../failing build/4 failed pickled/meson.build | 7 +++ test cases/failing build/5 failed pickled/false.py | 4 -- .../failing build/5 failed pickled/meson.build | 7 --- test cases/osx/10 global variable ar/libfile.c | 9 ++++ test cases/osx/10 global variable ar/libfile2.c | 7 +++ test cases/osx/10 global variable ar/meson.build | 6 +++ .../osx/10 global variable ar/nativefile.ini | 2 + test cases/osx/10 global variable ar/prog.c | 7 +++ test cases/osx/9 global variable ar/libfile.c | 9 ---- test cases/osx/9 global variable ar/libfile2.c | 7 --- test cases/osx/9 global variable ar/meson.build | 6 --- test cases/osx/9 global variable ar/nativefile.ini | 2 - test cases/osx/9 global variable ar/prog.c | 7 --- 50 files changed, 221 insertions(+), 221 deletions(-) delete mode 100644 test cases/common/273 environment/meson.build delete mode 100644 test cases/common/273 environment/testenv.py create mode 100644 test cases/common/274 environment/meson.build create mode 100644 test cases/common/274 environment/testenv.py create mode 100644 test cases/failing build/1 hidden symbol/bob.c create mode 100644 test cases/failing build/1 hidden symbol/bob.h create mode 100644 test cases/failing build/1 hidden symbol/bobuser.c create mode 100644 test cases/failing build/1 hidden symbol/meson.build delete mode 100644 test cases/failing build/2 hidden symbol/bob.c delete mode 100644 test cases/failing build/2 hidden symbol/bob.h delete mode 100644 test cases/failing build/2 hidden symbol/bobuser.c delete mode 100644 test cases/failing build/2 hidden symbol/meson.build create mode 100644 test cases/failing build/2 pch disabled/c/meson.build create mode 100644 test cases/failing build/2 pch disabled/c/pch/prog.h create mode 100644 test cases/failing build/2 pch disabled/c/pch/prog_pch.c create mode 100644 test cases/failing build/2 pch disabled/c/prog.c create mode 100644 test cases/failing build/2 pch disabled/meson.build create mode 100644 test cases/failing build/3 cmake subproject isolation/incDir/fileA.hpp create mode 100644 test cases/failing build/3 cmake subproject isolation/main.cpp create mode 100644 test cases/failing build/3 cmake subproject isolation/meson.build create mode 100644 test cases/failing build/3 cmake subproject isolation/subprojects/cmMod/CMakeLists.txt create mode 100644 test cases/failing build/3 cmake subproject isolation/subprojects/cmMod/cmMod.cpp create mode 100644 test cases/failing build/3 cmake subproject isolation/subprojects/cmMod/cmMod.hpp create mode 100644 test cases/failing build/3 cmake subproject isolation/test.json delete mode 100644 test cases/failing build/3 pch disabled/c/meson.build delete mode 100644 test cases/failing build/3 pch disabled/c/pch/prog.h delete mode 100644 test cases/failing build/3 pch disabled/c/pch/prog_pch.c delete mode 100644 test cases/failing build/3 pch disabled/c/prog.c delete mode 100644 test cases/failing build/3 pch disabled/meson.build delete mode 100644 test cases/failing build/4 cmake subproject isolation/incDir/fileA.hpp delete mode 100644 test cases/failing build/4 cmake subproject isolation/main.cpp delete mode 100644 test cases/failing build/4 cmake subproject isolation/meson.build delete mode 100644 test cases/failing build/4 cmake subproject isolation/subprojects/cmMod/CMakeLists.txt delete mode 100644 test cases/failing build/4 cmake subproject isolation/subprojects/cmMod/cmMod.cpp delete mode 100644 test cases/failing build/4 cmake subproject isolation/subprojects/cmMod/cmMod.hpp delete mode 100644 test cases/failing build/4 cmake subproject isolation/test.json create mode 100644 test cases/failing build/4 failed pickled/false.py create mode 100644 test cases/failing build/4 failed pickled/meson.build delete mode 100644 test cases/failing build/5 failed pickled/false.py delete mode 100644 test cases/failing build/5 failed pickled/meson.build create mode 100644 test cases/osx/10 global variable ar/libfile.c create mode 100644 test cases/osx/10 global variable ar/libfile2.c create mode 100644 test cases/osx/10 global variable ar/meson.build create mode 100644 test cases/osx/10 global variable ar/nativefile.ini create mode 100644 test cases/osx/10 global variable ar/prog.c delete mode 100644 test cases/osx/9 global variable ar/libfile.c delete mode 100644 test cases/osx/9 global variable ar/libfile2.c delete mode 100644 test cases/osx/9 global variable ar/meson.build delete mode 100644 test cases/osx/9 global variable ar/nativefile.ini delete mode 100644 test cases/osx/9 global variable ar/prog.c (limited to 'test cases') diff --git a/test cases/common/273 environment/meson.build b/test cases/common/273 environment/meson.build deleted file mode 100644 index af15c1b55..000000000 --- a/test cases/common/273 environment/meson.build +++ /dev/null @@ -1,50 +0,0 @@ -project( - 'environment', - meson_version: '>=1.4.0', -) - -testenv = find_program(files('testenv.py')) - - -env = environment() -env.unset('foo') -test('not set', testenv, args: ['foo'], env: env) - -testcase expect_error('You cannot set the already unset variable \'foo\'') - env.set('foo', 'bar') -endtestcase - -testcase expect_error('You cannot append to unset variable \'foo\'') - env.append('foo', 'bar') -endtestcase - -testcase expect_error('You cannot prepend to unset variable \'foo\'') - env.prepend('foo', 'bar') -endtestcase - - -env1 = environment('foo=bar', method: 'append', separator: ':') -env1.append('foo', 'baz', separator: ':') -test('append', testenv, args: ['foo', 'bar:baz'], env: env1) - -testcase expect_error('You cannot unset the \'foo\' variable because it is already set') - env1.unset('foo') -endtestcase - - -env2 = environment(['foo=baz'], method: 'prepend', separator: ':') -env2.prepend('foo', 'bar', separator: ':') -test('prepend', testenv, args: ['foo', 'bar:baz'], env: env2) - -testcase expect_error('You cannot unset the \'foo\' variable because it is already set') - env2.unset('foo') -endtestcase - - -env3 = environment({'foo': 'foobar'}, method: 'set', separator: ':') -env3.set('foo', 'qux') -test('reset', testenv, args: ['foo', 'qux'], env: env3) - -testcase expect_error('You cannot unset the \'foo\' variable because it is already set') - env3.unset('foo') -endtestcase diff --git a/test cases/common/273 environment/testenv.py b/test cases/common/273 environment/testenv.py deleted file mode 100644 index 1a59b8237..000000000 --- a/test cases/common/273 environment/testenv.py +++ /dev/null @@ -1,12 +0,0 @@ -#!/usr/bin/env python3 - -import os -import sys - -key = sys.argv[1] -expected = sys.argv[2] if len(sys.argv) > 2 else None - -if os.environ.get(key) == expected: - sys.exit(0) - -sys.exit(f'Expected {expected!r}, was {os.environ.get(key)!r}') diff --git a/test cases/common/274 environment/meson.build b/test cases/common/274 environment/meson.build new file mode 100644 index 000000000..af15c1b55 --- /dev/null +++ b/test cases/common/274 environment/meson.build @@ -0,0 +1,50 @@ +project( + 'environment', + meson_version: '>=1.4.0', +) + +testenv = find_program(files('testenv.py')) + + +env = environment() +env.unset('foo') +test('not set', testenv, args: ['foo'], env: env) + +testcase expect_error('You cannot set the already unset variable \'foo\'') + env.set('foo', 'bar') +endtestcase + +testcase expect_error('You cannot append to unset variable \'foo\'') + env.append('foo', 'bar') +endtestcase + +testcase expect_error('You cannot prepend to unset variable \'foo\'') + env.prepend('foo', 'bar') +endtestcase + + +env1 = environment('foo=bar', method: 'append', separator: ':') +env1.append('foo', 'baz', separator: ':') +test('append', testenv, args: ['foo', 'bar:baz'], env: env1) + +testcase expect_error('You cannot unset the \'foo\' variable because it is already set') + env1.unset('foo') +endtestcase + + +env2 = environment(['foo=baz'], method: 'prepend', separator: ':') +env2.prepend('foo', 'bar', separator: ':') +test('prepend', testenv, args: ['foo', 'bar:baz'], env: env2) + +testcase expect_error('You cannot unset the \'foo\' variable because it is already set') + env2.unset('foo') +endtestcase + + +env3 = environment({'foo': 'foobar'}, method: 'set', separator: ':') +env3.set('foo', 'qux') +test('reset', testenv, args: ['foo', 'qux'], env: env3) + +testcase expect_error('You cannot unset the \'foo\' variable because it is already set') + env3.unset('foo') +endtestcase diff --git a/test cases/common/274 environment/testenv.py b/test cases/common/274 environment/testenv.py new file mode 100644 index 000000000..1a59b8237 --- /dev/null +++ b/test cases/common/274 environment/testenv.py @@ -0,0 +1,12 @@ +#!/usr/bin/env python3 + +import os +import sys + +key = sys.argv[1] +expected = sys.argv[2] if len(sys.argv) > 2 else None + +if os.environ.get(key) == expected: + sys.exit(0) + +sys.exit(f'Expected {expected!r}, was {os.environ.get(key)!r}') diff --git a/test cases/failing build/1 hidden symbol/bob.c b/test cases/failing build/1 hidden symbol/bob.c new file mode 100644 index 000000000..9a3325a81 --- /dev/null +++ b/test cases/failing build/1 hidden symbol/bob.c @@ -0,0 +1,5 @@ +#include"bob.h" + +int hidden_function() { + return 7; +} diff --git a/test cases/failing build/1 hidden symbol/bob.h b/test cases/failing build/1 hidden symbol/bob.h new file mode 100644 index 000000000..947f6eec4 --- /dev/null +++ b/test cases/failing build/1 hidden symbol/bob.h @@ -0,0 +1,3 @@ +#pragma once + +int hidden_function(); diff --git a/test cases/failing build/1 hidden symbol/bobuser.c b/test cases/failing build/1 hidden symbol/bobuser.c new file mode 100644 index 000000000..89272ed6c --- /dev/null +++ b/test cases/failing build/1 hidden symbol/bobuser.c @@ -0,0 +1,5 @@ +#include"bob.h" + +int main(int argc, char **argv) { + return hidden_function(); +} diff --git a/test cases/failing build/1 hidden symbol/meson.build b/test cases/failing build/1 hidden symbol/meson.build new file mode 100644 index 000000000..f7c38e353 --- /dev/null +++ b/test cases/failing build/1 hidden symbol/meson.build @@ -0,0 +1,11 @@ +project('hidden symbol', 'c') + +if host_machine.system() == 'windows' or host_machine.system() == 'cygwin' + error('MESON_SKIP_TEST -fvisibility=hidden does not work for PE files.') +endif + +l = shared_library('bob', 'bob.c', + gnu_symbol_visibility: 'hidden') + +executable('bobuser', 'bobuser.c', + link_with: l) diff --git a/test cases/failing build/2 hidden symbol/bob.c b/test cases/failing build/2 hidden symbol/bob.c deleted file mode 100644 index 9a3325a81..000000000 --- a/test cases/failing build/2 hidden symbol/bob.c +++ /dev/null @@ -1,5 +0,0 @@ -#include"bob.h" - -int hidden_function() { - return 7; -} diff --git a/test cases/failing build/2 hidden symbol/bob.h b/test cases/failing build/2 hidden symbol/bob.h deleted file mode 100644 index 947f6eec4..000000000 --- a/test cases/failing build/2 hidden symbol/bob.h +++ /dev/null @@ -1,3 +0,0 @@ -#pragma once - -int hidden_function(); diff --git a/test cases/failing build/2 hidden symbol/bobuser.c b/test cases/failing build/2 hidden symbol/bobuser.c deleted file mode 100644 index 89272ed6c..000000000 --- a/test cases/failing build/2 hidden symbol/bobuser.c +++ /dev/null @@ -1,5 +0,0 @@ -#include"bob.h" - -int main(int argc, char **argv) { - return hidden_function(); -} diff --git a/test cases/failing build/2 hidden symbol/meson.build b/test cases/failing build/2 hidden symbol/meson.build deleted file mode 100644 index f7c38e353..000000000 --- a/test cases/failing build/2 hidden symbol/meson.build +++ /dev/null @@ -1,11 +0,0 @@ -project('hidden symbol', 'c') - -if host_machine.system() == 'windows' or host_machine.system() == 'cygwin' - error('MESON_SKIP_TEST -fvisibility=hidden does not work for PE files.') -endif - -l = shared_library('bob', 'bob.c', - gnu_symbol_visibility: 'hidden') - -executable('bobuser', 'bobuser.c', - link_with: l) diff --git a/test cases/failing build/2 pch disabled/c/meson.build b/test cases/failing build/2 pch disabled/c/meson.build new file mode 100644 index 000000000..1739126df --- /dev/null +++ b/test cases/failing build/2 pch disabled/c/meson.build @@ -0,0 +1,2 @@ +exe = executable('prog', 'prog.c', +c_pch : ['pch/prog_pch.c', 'pch/prog.h']) diff --git a/test cases/failing build/2 pch disabled/c/pch/prog.h b/test cases/failing build/2 pch disabled/c/pch/prog.h new file mode 100644 index 000000000..354499acd --- /dev/null +++ b/test cases/failing build/2 pch disabled/c/pch/prog.h @@ -0,0 +1 @@ +#include diff --git a/test cases/failing build/2 pch disabled/c/pch/prog_pch.c b/test cases/failing build/2 pch disabled/c/pch/prog_pch.c new file mode 100644 index 000000000..49605057b --- /dev/null +++ b/test cases/failing build/2 pch disabled/c/pch/prog_pch.c @@ -0,0 +1,5 @@ +#if !defined(_MSC_VER) +#error "This file is only for use with MSVC." +#endif + +#include "prog.h" diff --git a/test cases/failing build/2 pch disabled/c/prog.c b/test cases/failing build/2 pch disabled/c/prog.c new file mode 100644 index 000000000..f17bc9e1a --- /dev/null +++ b/test cases/failing build/2 pch disabled/c/prog.c @@ -0,0 +1,9 @@ +// No includes here, they need to come from the PCH + +void func() { + fprintf(stdout, "This is a function that fails if stdio is not #included.\n"); +} + +int main(int argc, char **argv) { + return 0; +} diff --git a/test cases/failing build/2 pch disabled/meson.build b/test cases/failing build/2 pch disabled/meson.build new file mode 100644 index 000000000..0a8fa6793 --- /dev/null +++ b/test cases/failing build/2 pch disabled/meson.build @@ -0,0 +1,5 @@ +# Disable PCH usage to make sure backends respect this setting. +# Since the .c file requires PCH usage (it does not include necessary +# headers itself), the build should fail. +project('pch test', 'c', default_options: ['b_pch=false']) +subdir('c') diff --git a/test cases/failing build/3 cmake subproject isolation/incDir/fileA.hpp b/test cases/failing build/3 cmake subproject isolation/incDir/fileA.hpp new file mode 100644 index 000000000..a5f09bed1 --- /dev/null +++ b/test cases/failing build/3 cmake subproject isolation/incDir/fileA.hpp @@ -0,0 +1,3 @@ +#pragma once + +#define SOME_DEFINE " World" diff --git a/test cases/failing build/3 cmake subproject isolation/main.cpp b/test cases/failing build/3 cmake subproject isolation/main.cpp new file mode 100644 index 000000000..95079615a --- /dev/null +++ b/test cases/failing build/3 cmake subproject isolation/main.cpp @@ -0,0 +1,10 @@ +#include +#include + +using namespace std; + +int main(void) { + cmModClass obj("Hello"); + cout << obj.getStr() << endl; + return 0; +} diff --git a/test cases/failing build/3 cmake subproject isolation/meson.build b/test cases/failing build/3 cmake subproject isolation/meson.build new file mode 100644 index 000000000..e60633595 --- /dev/null +++ b/test cases/failing build/3 cmake subproject isolation/meson.build @@ -0,0 +1,17 @@ +project('subproject isolation', ['c', 'cpp']) + +if not find_program('cmake', required: false).found() + error('MESON_SKIP_TEST CMake is not installed') +endif + +incdir = meson.source_root() / 'incDir' + +cm = import('cmake') + +# This should generate a warning and the include dir should be skipped. +sub_pro = cm.subproject('cmMod', cmake_options : [ '-DMESON_INC_DIR=' + incdir ]) +sub_dep = sub_pro.dependency('cmModLib++') + +# Since the include dir is skipped, the compilation of this project should fail. +exe1 = executable('main', ['main.cpp'], dependencies: [sub_dep]) +test('test1', exe1) diff --git a/test cases/failing build/3 cmake subproject isolation/subprojects/cmMod/CMakeLists.txt b/test cases/failing build/3 cmake subproject isolation/subprojects/cmMod/CMakeLists.txt new file mode 100644 index 000000000..852dd09a8 --- /dev/null +++ b/test cases/failing build/3 cmake subproject isolation/subprojects/cmMod/CMakeLists.txt @@ -0,0 +1,10 @@ +cmake_minimum_required(VERSION 3.5) + +project(cmMod) +set (CMAKE_CXX_STANDARD 14) + +include_directories(${CMAKE_CURRENT_BINARY_DIR} ${MESON_INC_DIR}) + +add_library(cmModLib++ SHARED cmMod.cpp) +include(GenerateExportHeader) +generate_export_header(cmModLib++) diff --git a/test cases/failing build/3 cmake subproject isolation/subprojects/cmMod/cmMod.cpp b/test cases/failing build/3 cmake subproject isolation/subprojects/cmMod/cmMod.cpp new file mode 100644 index 000000000..a668203d1 --- /dev/null +++ b/test cases/failing build/3 cmake subproject isolation/subprojects/cmMod/cmMod.cpp @@ -0,0 +1,12 @@ +#include "cmMod.hpp" +#include "fileA.hpp" + +using namespace std; + +cmModClass::cmModClass(string foo) { + str = foo + SOME_DEFINE; +} + +string cmModClass::getStr() const { + return str; +} diff --git a/test cases/failing build/3 cmake subproject isolation/subprojects/cmMod/cmMod.hpp b/test cases/failing build/3 cmake subproject isolation/subprojects/cmMod/cmMod.hpp new file mode 100644 index 000000000..0e6dc0484 --- /dev/null +++ b/test cases/failing build/3 cmake subproject isolation/subprojects/cmMod/cmMod.hpp @@ -0,0 +1,14 @@ +#pragma once + +#include "cmmodlib++_export.h" +#include + +class CMMODLIB___EXPORT cmModClass { +private: + std::string str; + +public: + cmModClass(std::string foo); + + std::string getStr() const; +}; diff --git a/test cases/failing build/3 cmake subproject isolation/test.json b/test cases/failing build/3 cmake subproject isolation/test.json new file mode 100644 index 000000000..b48d78add --- /dev/null +++ b/test cases/failing build/3 cmake subproject isolation/test.json @@ -0,0 +1,5 @@ +{ + "tools": { + "cmake": ">=3.14" + } +} diff --git a/test cases/failing build/3 pch disabled/c/meson.build b/test cases/failing build/3 pch disabled/c/meson.build deleted file mode 100644 index 1739126df..000000000 --- a/test cases/failing build/3 pch disabled/c/meson.build +++ /dev/null @@ -1,2 +0,0 @@ -exe = executable('prog', 'prog.c', -c_pch : ['pch/prog_pch.c', 'pch/prog.h']) diff --git a/test cases/failing build/3 pch disabled/c/pch/prog.h b/test cases/failing build/3 pch disabled/c/pch/prog.h deleted file mode 100644 index 354499acd..000000000 --- a/test cases/failing build/3 pch disabled/c/pch/prog.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/test cases/failing build/3 pch disabled/c/pch/prog_pch.c b/test cases/failing build/3 pch disabled/c/pch/prog_pch.c deleted file mode 100644 index 49605057b..000000000 --- a/test cases/failing build/3 pch disabled/c/pch/prog_pch.c +++ /dev/null @@ -1,5 +0,0 @@ -#if !defined(_MSC_VER) -#error "This file is only for use with MSVC." -#endif - -#include "prog.h" diff --git a/test cases/failing build/3 pch disabled/c/prog.c b/test cases/failing build/3 pch disabled/c/prog.c deleted file mode 100644 index f17bc9e1a..000000000 --- a/test cases/failing build/3 pch disabled/c/prog.c +++ /dev/null @@ -1,9 +0,0 @@ -// No includes here, they need to come from the PCH - -void func() { - fprintf(stdout, "This is a function that fails if stdio is not #included.\n"); -} - -int main(int argc, char **argv) { - return 0; -} diff --git a/test cases/failing build/3 pch disabled/meson.build b/test cases/failing build/3 pch disabled/meson.build deleted file mode 100644 index 0a8fa6793..000000000 --- a/test cases/failing build/3 pch disabled/meson.build +++ /dev/null @@ -1,5 +0,0 @@ -# Disable PCH usage to make sure backends respect this setting. -# Since the .c file requires PCH usage (it does not include necessary -# headers itself), the build should fail. -project('pch test', 'c', default_options: ['b_pch=false']) -subdir('c') diff --git a/test cases/failing build/4 cmake subproject isolation/incDir/fileA.hpp b/test cases/failing build/4 cmake subproject isolation/incDir/fileA.hpp deleted file mode 100644 index a5f09bed1..000000000 --- a/test cases/failing build/4 cmake subproject isolation/incDir/fileA.hpp +++ /dev/null @@ -1,3 +0,0 @@ -#pragma once - -#define SOME_DEFINE " World" diff --git a/test cases/failing build/4 cmake subproject isolation/main.cpp b/test cases/failing build/4 cmake subproject isolation/main.cpp deleted file mode 100644 index 95079615a..000000000 --- a/test cases/failing build/4 cmake subproject isolation/main.cpp +++ /dev/null @@ -1,10 +0,0 @@ -#include -#include - -using namespace std; - -int main(void) { - cmModClass obj("Hello"); - cout << obj.getStr() << endl; - return 0; -} diff --git a/test cases/failing build/4 cmake subproject isolation/meson.build b/test cases/failing build/4 cmake subproject isolation/meson.build deleted file mode 100644 index e60633595..000000000 --- a/test cases/failing build/4 cmake subproject isolation/meson.build +++ /dev/null @@ -1,17 +0,0 @@ -project('subproject isolation', ['c', 'cpp']) - -if not find_program('cmake', required: false).found() - error('MESON_SKIP_TEST CMake is not installed') -endif - -incdir = meson.source_root() / 'incDir' - -cm = import('cmake') - -# This should generate a warning and the include dir should be skipped. -sub_pro = cm.subproject('cmMod', cmake_options : [ '-DMESON_INC_DIR=' + incdir ]) -sub_dep = sub_pro.dependency('cmModLib++') - -# Since the include dir is skipped, the compilation of this project should fail. -exe1 = executable('main', ['main.cpp'], dependencies: [sub_dep]) -test('test1', exe1) diff --git a/test cases/failing build/4 cmake subproject isolation/subprojects/cmMod/CMakeLists.txt b/test cases/failing build/4 cmake subproject isolation/subprojects/cmMod/CMakeLists.txt deleted file mode 100644 index 852dd09a8..000000000 --- a/test cases/failing build/4 cmake subproject isolation/subprojects/cmMod/CMakeLists.txt +++ /dev/null @@ -1,10 +0,0 @@ -cmake_minimum_required(VERSION 3.5) - -project(cmMod) -set (CMAKE_CXX_STANDARD 14) - -include_directories(${CMAKE_CURRENT_BINARY_DIR} ${MESON_INC_DIR}) - -add_library(cmModLib++ SHARED cmMod.cpp) -include(GenerateExportHeader) -generate_export_header(cmModLib++) diff --git a/test cases/failing build/4 cmake subproject isolation/subprojects/cmMod/cmMod.cpp b/test cases/failing build/4 cmake subproject isolation/subprojects/cmMod/cmMod.cpp deleted file mode 100644 index a668203d1..000000000 --- a/test cases/failing build/4 cmake subproject isolation/subprojects/cmMod/cmMod.cpp +++ /dev/null @@ -1,12 +0,0 @@ -#include "cmMod.hpp" -#include "fileA.hpp" - -using namespace std; - -cmModClass::cmModClass(string foo) { - str = foo + SOME_DEFINE; -} - -string cmModClass::getStr() const { - return str; -} diff --git a/test cases/failing build/4 cmake subproject isolation/subprojects/cmMod/cmMod.hpp b/test cases/failing build/4 cmake subproject isolation/subprojects/cmMod/cmMod.hpp deleted file mode 100644 index 0e6dc0484..000000000 --- a/test cases/failing build/4 cmake subproject isolation/subprojects/cmMod/cmMod.hpp +++ /dev/null @@ -1,14 +0,0 @@ -#pragma once - -#include "cmmodlib++_export.h" -#include - -class CMMODLIB___EXPORT cmModClass { -private: - std::string str; - -public: - cmModClass(std::string foo); - - std::string getStr() const; -}; diff --git a/test cases/failing build/4 cmake subproject isolation/test.json b/test cases/failing build/4 cmake subproject isolation/test.json deleted file mode 100644 index b48d78add..000000000 --- a/test cases/failing build/4 cmake subproject isolation/test.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "tools": { - "cmake": ">=3.14" - } -} diff --git a/test cases/failing build/4 failed pickled/false.py b/test cases/failing build/4 failed pickled/false.py new file mode 100644 index 000000000..865aeb967 --- /dev/null +++ b/test cases/failing build/4 failed pickled/false.py @@ -0,0 +1,4 @@ +#!/usr/bin/env python3 + +import sys +sys.exit(1) diff --git a/test cases/failing build/4 failed pickled/meson.build b/test cases/failing build/4 failed pickled/meson.build new file mode 100644 index 000000000..924502066 --- /dev/null +++ b/test cases/failing build/4 failed pickled/meson.build @@ -0,0 +1,7 @@ +project('failed pickled command') + +custom_target('failure', + command: [find_program('false.py'), '\n'], + output: 'output.txt', + build_by_default: true, +) diff --git a/test cases/failing build/5 failed pickled/false.py b/test cases/failing build/5 failed pickled/false.py deleted file mode 100644 index 865aeb967..000000000 --- a/test cases/failing build/5 failed pickled/false.py +++ /dev/null @@ -1,4 +0,0 @@ -#!/usr/bin/env python3 - -import sys -sys.exit(1) diff --git a/test cases/failing build/5 failed pickled/meson.build b/test cases/failing build/5 failed pickled/meson.build deleted file mode 100644 index 924502066..000000000 --- a/test cases/failing build/5 failed pickled/meson.build +++ /dev/null @@ -1,7 +0,0 @@ -project('failed pickled command') - -custom_target('failure', - command: [find_program('false.py'), '\n'], - output: 'output.txt', - build_by_default: true, -) diff --git a/test cases/osx/10 global variable ar/libfile.c b/test cases/osx/10 global variable ar/libfile.c new file mode 100644 index 000000000..b258d7b82 --- /dev/null +++ b/test cases/osx/10 global variable ar/libfile.c @@ -0,0 +1,9 @@ +// Source: https://lists.gnu.org/archive/html/libtool/2002-07/msg00025.html + +#include + +extern int l2; +void l1(void) +{ + printf("l1 %d\n", l2); +} diff --git a/test cases/osx/10 global variable ar/libfile2.c b/test cases/osx/10 global variable ar/libfile2.c new file mode 100644 index 000000000..1499c4dc7 --- /dev/null +++ b/test cases/osx/10 global variable ar/libfile2.c @@ -0,0 +1,7 @@ +// Source: https://lists.gnu.org/archive/html/libtool/2002-07/msg00025.html + +int l2; +void l2_func(void) +{ + l2 = 77; +} diff --git a/test cases/osx/10 global variable ar/meson.build b/test cases/osx/10 global variable ar/meson.build new file mode 100644 index 000000000..313dd1b37 --- /dev/null +++ b/test cases/osx/10 global variable ar/meson.build @@ -0,0 +1,6 @@ +# Source: https://lists.gnu.org/archive/html/libtool/2002-07/msg00025.html + +project('global variable test', 'c') + +lib = static_library('mylib', 'libfile.c', 'libfile2.c') +test('global variable', executable('prog', 'prog.c', link_with: lib)) diff --git a/test cases/osx/10 global variable ar/nativefile.ini b/test cases/osx/10 global variable ar/nativefile.ini new file mode 100644 index 000000000..4fb5e7f7d --- /dev/null +++ b/test cases/osx/10 global variable ar/nativefile.ini @@ -0,0 +1,2 @@ +[binaries] +ar = 'ar' diff --git a/test cases/osx/10 global variable ar/prog.c b/test cases/osx/10 global variable ar/prog.c new file mode 100644 index 000000000..4665016f6 --- /dev/null +++ b/test cases/osx/10 global variable ar/prog.c @@ -0,0 +1,7 @@ +// Source: https://lists.gnu.org/archive/html/libtool/2002-07/msg00025.html + +extern void l1(void); +int main(void) +{ + l1(); +} diff --git a/test cases/osx/9 global variable ar/libfile.c b/test cases/osx/9 global variable ar/libfile.c deleted file mode 100644 index b258d7b82..000000000 --- a/test cases/osx/9 global variable ar/libfile.c +++ /dev/null @@ -1,9 +0,0 @@ -// Source: https://lists.gnu.org/archive/html/libtool/2002-07/msg00025.html - -#include - -extern int l2; -void l1(void) -{ - printf("l1 %d\n", l2); -} diff --git a/test cases/osx/9 global variable ar/libfile2.c b/test cases/osx/9 global variable ar/libfile2.c deleted file mode 100644 index 1499c4dc7..000000000 --- a/test cases/osx/9 global variable ar/libfile2.c +++ /dev/null @@ -1,7 +0,0 @@ -// Source: https://lists.gnu.org/archive/html/libtool/2002-07/msg00025.html - -int l2; -void l2_func(void) -{ - l2 = 77; -} diff --git a/test cases/osx/9 global variable ar/meson.build b/test cases/osx/9 global variable ar/meson.build deleted file mode 100644 index 313dd1b37..000000000 --- a/test cases/osx/9 global variable ar/meson.build +++ /dev/null @@ -1,6 +0,0 @@ -# Source: https://lists.gnu.org/archive/html/libtool/2002-07/msg00025.html - -project('global variable test', 'c') - -lib = static_library('mylib', 'libfile.c', 'libfile2.c') -test('global variable', executable('prog', 'prog.c', link_with: lib)) diff --git a/test cases/osx/9 global variable ar/nativefile.ini b/test cases/osx/9 global variable ar/nativefile.ini deleted file mode 100644 index 4fb5e7f7d..000000000 --- a/test cases/osx/9 global variable ar/nativefile.ini +++ /dev/null @@ -1,2 +0,0 @@ -[binaries] -ar = 'ar' diff --git a/test cases/osx/9 global variable ar/prog.c b/test cases/osx/9 global variable ar/prog.c deleted file mode 100644 index 4665016f6..000000000 --- a/test cases/osx/9 global variable ar/prog.c +++ /dev/null @@ -1,7 +0,0 @@ -// Source: https://lists.gnu.org/archive/html/libtool/2002-07/msg00025.html - -extern void l1(void); -int main(void) -{ - l1(); -} -- cgit v1.2.3