From e2afaf40c0d1c4bfbc4032d955f6cd65a20a0cba Mon Sep 17 00:00:00 2001 From: Xavier Claessens Date: Tue, 5 Dec 2017 21:15:01 -0800 Subject: Fix duplicated test case 168 --- test cases/common/168 subdir if_found/meson.build | 11 ----------- test cases/common/168 subdir if_found/subdir/meson.build | 1 - test cases/common/172 subdir if_found/meson.build | 11 +++++++++++ test cases/common/172 subdir if_found/subdir/meson.build | 1 + 4 files changed, 12 insertions(+), 12 deletions(-) delete mode 100644 test cases/common/168 subdir if_found/meson.build delete mode 100644 test cases/common/168 subdir if_found/subdir/meson.build create mode 100644 test cases/common/172 subdir if_found/meson.build create mode 100644 test cases/common/172 subdir if_found/subdir/meson.build diff --git a/test cases/common/168 subdir if_found/meson.build b/test cases/common/168 subdir if_found/meson.build deleted file mode 100644 index 2c640cf..0000000 --- a/test cases/common/168 subdir if_found/meson.build +++ /dev/null @@ -1,11 +0,0 @@ -project('subdir if found', 'c') - -found_dep = declare_dependency() -not_found_dep = dependency('nonexisting', required : false) - -subdir('nonexisting_dir', if_found : not_found_dep) - -variable = 3 - -subdir('subdir', if_found : found_dep) -assert(variable == 5, 'Subdir was not properly entered.') diff --git a/test cases/common/168 subdir if_found/subdir/meson.build b/test cases/common/168 subdir if_found/subdir/meson.build deleted file mode 100644 index 1030e25..0000000 --- a/test cases/common/168 subdir if_found/subdir/meson.build +++ /dev/null @@ -1 +0,0 @@ -variable = 5 diff --git a/test cases/common/172 subdir if_found/meson.build b/test cases/common/172 subdir if_found/meson.build new file mode 100644 index 0000000..2c640cf --- /dev/null +++ b/test cases/common/172 subdir if_found/meson.build @@ -0,0 +1,11 @@ +project('subdir if found', 'c') + +found_dep = declare_dependency() +not_found_dep = dependency('nonexisting', required : false) + +subdir('nonexisting_dir', if_found : not_found_dep) + +variable = 3 + +subdir('subdir', if_found : found_dep) +assert(variable == 5, 'Subdir was not properly entered.') diff --git a/test cases/common/172 subdir if_found/subdir/meson.build b/test cases/common/172 subdir if_found/subdir/meson.build new file mode 100644 index 0000000..1030e25 --- /dev/null +++ b/test cases/common/172 subdir if_found/subdir/meson.build @@ -0,0 +1 @@ +variable = 5 -- cgit v1.1