diff options
| -rw-r--r-- | test cases/common/16 configure file/dumpprog.c | 20 | ||||
| -rw-r--r-- | test cases/common/16 configure file/meson.build | 10 |
2 files changed, 10 insertions, 20 deletions
diff --git a/test cases/common/16 configure file/dumpprog.c b/test cases/common/16 configure file/dumpprog.c index 4c21e87..39a215e 100644 --- a/test cases/common/16 configure file/dumpprog.c +++ b/test cases/common/16 configure file/dumpprog.c @@ -16,6 +16,10 @@ #define str(s) #s int main(int argc, char **argv) { +#if !(SHOULD_BE_UNQUOTED_STRING == string) + printf("String token (unquoted) defined wrong.\n"); + return 1; +#endif if(strcmp(SHOULD_BE_STRING, "string") != 0) { printf("String token defined wrong.\n"); return 1; @@ -32,22 +36,6 @@ int main(int argc, char **argv) { printf("String token 4 defined wrong.\n"); return 1; } -#if !(SHOULD_BE_UNQUOTED_STRING == string) - printf("String token (unquoted) defined wrong.\n"); - return 1; -#endif - if(strcmp(stringify(SHOULD_BE_UNQUOTED_STRING2), "A \"B\" C") != 0) { - printf("String token 2 (unquoted) defined wrong.\n"); - return 1; - } - if(strcmp(stringify(SHOULD_BE_UNQUOTED_STRING3), "A \"\" C") != 0) { - printf("String token 3 (unquoted) defined wrong.\n"); - return 1; - } - if(strcmp(stringify(SHOULD_BE_UNQUOTED_STRING4), "A \" C") != 0) { - printf("String token 4 (unquoted) defined wrong.\n"); - return 1; - } if(SHOULD_BE_ONE != 1) { printf("One defined incorrectly.\n"); return 1; diff --git a/test cases/common/16 configure file/meson.build b/test cases/common/16 configure file/meson.build index 0861bcc..1e5a819 100644 --- a/test cases/common/16 configure file/meson.build +++ b/test cases/common/16 configure file/meson.build @@ -64,16 +64,18 @@ dump.set_quoted('SHOULD_BE_STRING', 'string', description : 'A string') dump.set_quoted('SHOULD_BE_STRING2', 'A "B" C') dump.set_quoted('SHOULD_BE_STRING3', 'A "" C') dump.set_quoted('SHOULD_BE_STRING4', 'A " C') -dump.set('SHOULD_BE_UNQUOTED_STRING', dump.get_unquoted('SHOULD_BE_STRING')) -dump.set('SHOULD_BE_UNQUOTED_STRING2', dump.get_unquoted('SHOULD_BE_STRING2')) -dump.set('SHOULD_BE_UNQUOTED_STRING3', dump.get_unquoted('SHOULD_BE_STRING3')) -dump.set('SHOULD_BE_UNQUOTED_STRING4', dump.get_unquoted('SHOULD_BE_STRING4')) dump.set('SHOULD_BE_RETURN', 'return') dump.set('SHOULD_BE_DEFINED', true) dump.set('SHOULD_BE_UNDEFINED', false) dump.set('SHOULD_BE_ONE', 1) dump.set('SHOULD_BE_ZERO', 0, description : 'Absolutely zero') dump.set('SHOULD_BE_QUOTED_ONE', '"1"') + +dump.set_quoted('INTEGER_AS_STRING', '12') +if dump.get_unquoted('INTEGER_AS_STRING').to_int() == 12 + dump.set('SHOULD_BE_UNQUOTED_STRING', dump.get_unquoted('SHOULD_BE_STRING')) +endif + configure_file(output : 'config3.h', configuration : dump) |