From dc31d30cbefcd042d1ebc2c20dd8b767a79c2c33 Mon Sep 17 00:00:00 2001 From: Jussi Pakkanen Date: Mon, 27 Nov 2017 23:46:18 +0200 Subject: Renamed test dir. --- test cases/common/161 dolphin option/badgenerator.py | 3 --- .../common/161 dolphin option/deplookups/meson.build | 20 -------------------- test cases/common/161 dolphin option/encprog.c | 10 ---------- test cases/common/161 dolphin option/meson.build | 19 ------------------- .../common/161 dolphin option/meson_options.txt | 6 ------ test cases/common/165 dolphin option/badgenerator.py | 3 +++ .../common/165 dolphin option/deplookups/meson.build | 20 ++++++++++++++++++++ test cases/common/165 dolphin option/encprog.c | 10 ++++++++++ test cases/common/165 dolphin option/meson.build | 19 +++++++++++++++++++ .../common/165 dolphin option/meson_options.txt | 6 ++++++ 10 files changed, 58 insertions(+), 58 deletions(-) delete mode 100755 test cases/common/161 dolphin option/badgenerator.py delete mode 100644 test cases/common/161 dolphin option/deplookups/meson.build delete mode 100644 test cases/common/161 dolphin option/encprog.c delete mode 100644 test cases/common/161 dolphin option/meson.build delete mode 100644 test cases/common/161 dolphin option/meson_options.txt create mode 100755 test cases/common/165 dolphin option/badgenerator.py create mode 100644 test cases/common/165 dolphin option/deplookups/meson.build create mode 100644 test cases/common/165 dolphin option/encprog.c create mode 100644 test cases/common/165 dolphin option/meson.build create mode 100644 test cases/common/165 dolphin option/meson_options.txt diff --git a/test cases/common/161 dolphin option/badgenerator.py b/test cases/common/161 dolphin option/badgenerator.py deleted file mode 100755 index 2f34c6c..0000000 --- a/test cases/common/161 dolphin option/badgenerator.py +++ /dev/null @@ -1,3 +0,0 @@ -#!/usr/bin/env python3 - -print('I am a bad generator. I do not work.') diff --git a/test cases/common/161 dolphin option/deplookups/meson.build b/test cases/common/161 dolphin option/deplookups/meson.build deleted file mode 100644 index d57c526..0000000 --- a/test cases/common/161 dolphin option/deplookups/meson.build +++ /dev/null @@ -1,20 +0,0 @@ -exist_auto = dependency('zlib', options : 'auto_opt') -exist_req = dependency('zlib', options : 'req_opt') -exist_disable = dependency('zlib', options : 'dis_opt') - -copy_of_exist_disable = exist_disable - -not_exist_auto = dependency('nonexist', options : 'auto_opt') -# This is not valid because it would fail execution. -# This combination is tested in a failing test. -#not_exist_req = dependency('nonexist', options : 'req_opt') -not_exist_disable = dependency('nonexist', options : 'dis_opt') - -assert(exist_auto.found(), 'Zlib not found') -assert(exist_req.found(), 'Zlib not found') -assert(not exist_disable.found(), 'A disabled dependency claims to be found.') -assert(not copy_of_exist_disable.found(), 'A copied disabled dependency works incorrectly.') - -assert(not not_exist_auto.found(), 'Nonexisting dependency was found.') -assert(not not_exist_disable.found(), 'Nonexisting dependency was found.') - diff --git a/test cases/common/161 dolphin option/encprog.c b/test cases/common/161 dolphin option/encprog.c deleted file mode 100644 index 8d9a87d..0000000 --- a/test cases/common/161 dolphin option/encprog.c +++ /dev/null @@ -1,10 +0,0 @@ -#include -#include -#include - -int main(int argc, char **argv) { - x264_t *h; - h = x264_encoder_open(NULL); - x264_encoder_close(h); - return 0; -} diff --git a/test cases/common/161 dolphin option/meson.build b/test cases/common/161 dolphin option/meson.build deleted file mode 100644 index 40cd4d5..0000000 --- a/test cases/common/161 dolphin option/meson.build +++ /dev/null @@ -1,19 +0,0 @@ -project('dolphin option', 'c') - -x264_dep = dependency('x264', options : ['video', 'patented']) - -exe = executable('encprog', 'encprog.c', - dependencies : x264_dep) -test('enc test', exe) - -gs = custom_target('somec', - input : 'proggie.c.in', - output : 'proggie.c', - command : [exe, '@INPUT@', '@OUTPUT@'], - ) - -test('Generated test', executable('proggie', gs)) - -if not meson.is_cross_build() and find_program('pkg-config', required:false).found() - subdir('deplookups') -endif diff --git a/test cases/common/161 dolphin option/meson_options.txt b/test cases/common/161 dolphin option/meson_options.txt deleted file mode 100644 index c09eba6..0000000 --- a/test cases/common/161 dolphin option/meson_options.txt +++ /dev/null @@ -1,6 +0,0 @@ -option('video', type : 'dolphin') -option('patented', type : 'dolphin', value : 'disabled') - -option('req_opt', type : 'dolphin', value : 'required') -option('auto_opt', type : 'dolphin', value : 'not_required') -option('dis_opt', type : 'dolphin', value : 'disabled') diff --git a/test cases/common/165 dolphin option/badgenerator.py b/test cases/common/165 dolphin option/badgenerator.py new file mode 100755 index 0000000..2f34c6c --- /dev/null +++ b/test cases/common/165 dolphin option/badgenerator.py @@ -0,0 +1,3 @@ +#!/usr/bin/env python3 + +print('I am a bad generator. I do not work.') diff --git a/test cases/common/165 dolphin option/deplookups/meson.build b/test cases/common/165 dolphin option/deplookups/meson.build new file mode 100644 index 0000000..d57c526 --- /dev/null +++ b/test cases/common/165 dolphin option/deplookups/meson.build @@ -0,0 +1,20 @@ +exist_auto = dependency('zlib', options : 'auto_opt') +exist_req = dependency('zlib', options : 'req_opt') +exist_disable = dependency('zlib', options : 'dis_opt') + +copy_of_exist_disable = exist_disable + +not_exist_auto = dependency('nonexist', options : 'auto_opt') +# This is not valid because it would fail execution. +# This combination is tested in a failing test. +#not_exist_req = dependency('nonexist', options : 'req_opt') +not_exist_disable = dependency('nonexist', options : 'dis_opt') + +assert(exist_auto.found(), 'Zlib not found') +assert(exist_req.found(), 'Zlib not found') +assert(not exist_disable.found(), 'A disabled dependency claims to be found.') +assert(not copy_of_exist_disable.found(), 'A copied disabled dependency works incorrectly.') + +assert(not not_exist_auto.found(), 'Nonexisting dependency was found.') +assert(not not_exist_disable.found(), 'Nonexisting dependency was found.') + diff --git a/test cases/common/165 dolphin option/encprog.c b/test cases/common/165 dolphin option/encprog.c new file mode 100644 index 0000000..8d9a87d --- /dev/null +++ b/test cases/common/165 dolphin option/encprog.c @@ -0,0 +1,10 @@ +#include +#include +#include + +int main(int argc, char **argv) { + x264_t *h; + h = x264_encoder_open(NULL); + x264_encoder_close(h); + return 0; +} diff --git a/test cases/common/165 dolphin option/meson.build b/test cases/common/165 dolphin option/meson.build new file mode 100644 index 0000000..40cd4d5 --- /dev/null +++ b/test cases/common/165 dolphin option/meson.build @@ -0,0 +1,19 @@ +project('dolphin option', 'c') + +x264_dep = dependency('x264', options : ['video', 'patented']) + +exe = executable('encprog', 'encprog.c', + dependencies : x264_dep) +test('enc test', exe) + +gs = custom_target('somec', + input : 'proggie.c.in', + output : 'proggie.c', + command : [exe, '@INPUT@', '@OUTPUT@'], + ) + +test('Generated test', executable('proggie', gs)) + +if not meson.is_cross_build() and find_program('pkg-config', required:false).found() + subdir('deplookups') +endif diff --git a/test cases/common/165 dolphin option/meson_options.txt b/test cases/common/165 dolphin option/meson_options.txt new file mode 100644 index 0000000..c09eba6 --- /dev/null +++ b/test cases/common/165 dolphin option/meson_options.txt @@ -0,0 +1,6 @@ +option('video', type : 'dolphin') +option('patented', type : 'dolphin', value : 'disabled') + +option('req_opt', type : 'dolphin', value : 'required') +option('auto_opt', type : 'dolphin', value : 'not_required') +option('dis_opt', type : 'dolphin', value : 'disabled') -- cgit v1.1