diff options
| author | Nirbheek Chauhan <nirbheek@centricular.com> | 2018-07-03 19:32:03 +0530 |
|---|---|---|
| committer | Nirbheek Chauhan <nirbheek.chauhan@gmail.com> | 2018-07-04 00:25:01 +0000 |
| commit | 2ac6f6be3295db8bd13e1d7e158bd1a2f06a0cc0 (patch) | |
| tree | 81ae2abf51ae08a9a403ed4adadca59b2e721306 /test cases/common | |
| parent | 70bc754a2c73da688caf553a00562562e1b5e75a (diff) | |
| download | meson-2ac6f6be3295db8bd13e1d7e158bd1a2f06a0cc0.tar.gz | |
test cases: Merge two configure_file tests
Unnecessary overhead having a separate test like that.
Diffstat (limited to 'test cases/common')
| -rw-r--r-- | test cases/common/157 configure file in test/meson.build | 9 | ||||
| -rw-r--r-- | test cases/common/16 configure file/meson.build | 8 | ||||
| -rw-r--r--[-rwxr-xr-x] | test cases/common/16 configure file/test.py.in (renamed from test cases/common/157 configure file in test/test.py.in) | 0 |
3 files changed, 8 insertions, 9 deletions
diff --git a/test cases/common/157 configure file in test/meson.build b/test cases/common/157 configure file in test/meson.build deleted file mode 100644 index 902810147..000000000 --- a/test cases/common/157 configure file in test/meson.build +++ /dev/null @@ -1,9 +0,0 @@ -project('conf file in test') - -test_file = configure_file( - input: 'test.py.in', - output: 'test.py', - configuration: configuration_data() -) - -test('configure-file', test_file) diff --git a/test cases/common/16 configure file/meson.build b/test cases/common/16 configure file/meson.build index 333b12152..1850c2b76 100644 --- a/test cases/common/16 configure file/meson.build +++ b/test cases/common/16 configure file/meson.build @@ -184,3 +184,11 @@ configure_file( encoding : 'koi8-r', configuration : conf8 ) + +test_file = configure_file( + input: 'test.py.in', + output: 'test.py', + configuration: configuration_data() +) + +test('configure-file', test_file) diff --git a/test cases/common/157 configure file in test/test.py.in b/test cases/common/16 configure file/test.py.in index 15a61f578..15a61f578 100755..100644 --- a/test cases/common/157 configure file in test/test.py.in +++ b/test cases/common/16 configure file/test.py.in |