From 5b49974bd6ddd248b5ee1b1e29c0acfc3c422a3a Mon Sep 17 00:00:00 2001 From: Tim Foley Date: Mon, 12 Jun 2017 12:42:17 -0700 Subject: Rename tests from `*.spire` to `*.slang` Many of the existing test cases were being skipped on accident, because their file names used `.spire` and the test tool was now looking for `.slang` --- tests/preprocessor/define-function-like.slang | 19 +++++++++++++++++++ .../preprocessor/define-function-like.slang.expected | 7 +++++++ tests/preprocessor/define-function-like.spire | 19 ------------------- .../preprocessor/define-function-like.spire.expected | 7 ------- tests/preprocessor/define-simple.slang | 14 ++++++++++++++ tests/preprocessor/define-simple.spire | 14 -------------- tests/preprocessor/if.slang | 15 +++++++++++++++ tests/preprocessor/if.spire | 15 --------------- tests/preprocessor/ifdef.slang | 16 ++++++++++++++++ tests/preprocessor/ifdef.spire | 16 ---------------- tests/preprocessor/include-a.slang.h | 3 +++ tests/preprocessor/include-a.spireh | 3 --- tests/preprocessor/include.slang | 8 ++++++++ tests/preprocessor/include.spire | 8 -------- 14 files changed, 82 insertions(+), 82 deletions(-) create mode 100644 tests/preprocessor/define-function-like.slang create mode 100644 tests/preprocessor/define-function-like.slang.expected delete mode 100644 tests/preprocessor/define-function-like.spire delete mode 100644 tests/preprocessor/define-function-like.spire.expected create mode 100644 tests/preprocessor/define-simple.slang delete mode 100644 tests/preprocessor/define-simple.spire create mode 100644 tests/preprocessor/if.slang delete mode 100644 tests/preprocessor/if.spire create mode 100644 tests/preprocessor/ifdef.slang delete mode 100644 tests/preprocessor/ifdef.spire create mode 100644 tests/preprocessor/include-a.slang.h delete mode 100644 tests/preprocessor/include-a.spireh create mode 100644 tests/preprocessor/include.slang delete mode 100644 tests/preprocessor/include.spire (limited to 'tests/preprocessor') diff --git a/tests/preprocessor/define-function-like.slang b/tests/preprocessor/define-function-like.slang new file mode 100644 index 000000000..f1dd9caa4 --- /dev/null +++ b/tests/preprocessor/define-function-like.slang @@ -0,0 +1,19 @@ +//TEST:SIMPLE: +// support for function-like macros + +#define FOO(x) 1.0 + x + +float foo(float y) { return FOO(y) * 2.0; } + +// simple token pasting + +#define PASTE(a,b) a##b + +PASTE(flo,at) bar() { return 0.0; } + +// no space before parens? not a function-like macro + +#define M (x) - (x) + +// Error: undefined identifier `x` +float bar(float a) { return M(a); } diff --git a/tests/preprocessor/define-function-like.slang.expected b/tests/preprocessor/define-function-like.slang.expected new file mode 100644 index 000000000..aed62dc31 --- /dev/null +++ b/tests/preprocessor/define-function-like.slang.expected @@ -0,0 +1,7 @@ +result code = -1 +standard error = { +tests/preprocessor/define-function-like.slang(16): error 30015: undefined identifier 'x'. +tests/preprocessor/define-function-like.slang(16): error 30015: undefined identifier 'x'. +} +standard output = { +} diff --git a/tests/preprocessor/define-function-like.spire b/tests/preprocessor/define-function-like.spire deleted file mode 100644 index f1dd9caa4..000000000 --- a/tests/preprocessor/define-function-like.spire +++ /dev/null @@ -1,19 +0,0 @@ -//TEST:SIMPLE: -// support for function-like macros - -#define FOO(x) 1.0 + x - -float foo(float y) { return FOO(y) * 2.0; } - -// simple token pasting - -#define PASTE(a,b) a##b - -PASTE(flo,at) bar() { return 0.0; } - -// no space before parens? not a function-like macro - -#define M (x) - (x) - -// Error: undefined identifier `x` -float bar(float a) { return M(a); } diff --git a/tests/preprocessor/define-function-like.spire.expected b/tests/preprocessor/define-function-like.spire.expected deleted file mode 100644 index e7b2a582a..000000000 --- a/tests/preprocessor/define-function-like.spire.expected +++ /dev/null @@ -1,7 +0,0 @@ -result code = -1 -standard error = { -Tests/Preprocessor/define-function-like.spire(16): error 30015: undefined identifier 'x'. -Tests/Preprocessor/define-function-like.spire(16): error 30015: undefined identifier 'x'. -} -standard output = { -} diff --git a/tests/preprocessor/define-simple.slang b/tests/preprocessor/define-simple.slang new file mode 100644 index 000000000..26436b258 --- /dev/null +++ b/tests/preprocessor/define-simple.slang @@ -0,0 +1,14 @@ +//TEST:SIMPLE: +// #define support + +#define FOO 1.0f + +float foo() { return FOO + 2.0; } + +#define BAR 99 + +#if BAR > 10 +int bar() { return 0; } +#else +BadThing shouldntCompile; +#endif diff --git a/tests/preprocessor/define-simple.spire b/tests/preprocessor/define-simple.spire deleted file mode 100644 index 26436b258..000000000 --- a/tests/preprocessor/define-simple.spire +++ /dev/null @@ -1,14 +0,0 @@ -//TEST:SIMPLE: -// #define support - -#define FOO 1.0f - -float foo() { return FOO + 2.0; } - -#define BAR 99 - -#if BAR > 10 -int bar() { return 0; } -#else -BadThing shouldntCompile; -#endif diff --git a/tests/preprocessor/if.slang b/tests/preprocessor/if.slang new file mode 100644 index 000000000..fe5948c33 --- /dev/null +++ b/tests/preprocessor/if.slang @@ -0,0 +1,15 @@ +//TEST:SIMPLE: +// #ifdef support + + +#if (1 - 1*2) < 0 +int foo() { return 0; } +#else +BadThing thatWontCompile; +#endif + +#if (1 >> 1) && ~999 +AnotherError onThisLine; +#else +int bar() { return foo(); } +#endif \ No newline at end of file diff --git a/tests/preprocessor/if.spire b/tests/preprocessor/if.spire deleted file mode 100644 index fe5948c33..000000000 --- a/tests/preprocessor/if.spire +++ /dev/null @@ -1,15 +0,0 @@ -//TEST:SIMPLE: -// #ifdef support - - -#if (1 - 1*2) < 0 -int foo() { return 0; } -#else -BadThing thatWontCompile; -#endif - -#if (1 >> 1) && ~999 -AnotherError onThisLine; -#else -int bar() { return foo(); } -#endif \ No newline at end of file diff --git a/tests/preprocessor/ifdef.slang b/tests/preprocessor/ifdef.slang new file mode 100644 index 000000000..a3ca82838 --- /dev/null +++ b/tests/preprocessor/ifdef.slang @@ -0,0 +1,16 @@ +//TEST:SIMPLE: +// #ifdef support + +#define A + +#ifdef A +int foo() { return 0; } +#else +BadThing thatWontCompile; +#endif + +#ifdef BadThing +AnotherError onThisLine; +#else +int bar() { return foo(); } +#endif \ No newline at end of file diff --git a/tests/preprocessor/ifdef.spire b/tests/preprocessor/ifdef.spire deleted file mode 100644 index a3ca82838..000000000 --- a/tests/preprocessor/ifdef.spire +++ /dev/null @@ -1,16 +0,0 @@ -//TEST:SIMPLE: -// #ifdef support - -#define A - -#ifdef A -int foo() { return 0; } -#else -BadThing thatWontCompile; -#endif - -#ifdef BadThing -AnotherError onThisLine; -#else -int bar() { return foo(); } -#endif \ No newline at end of file diff --git a/tests/preprocessor/include-a.slang.h b/tests/preprocessor/include-a.slang.h new file mode 100644 index 000000000..8fecc6a98 --- /dev/null +++ b/tests/preprocessor/include-a.slang.h @@ -0,0 +1,3 @@ +// #include support + +int bar() { return foo(); } \ No newline at end of file diff --git a/tests/preprocessor/include-a.spireh b/tests/preprocessor/include-a.spireh deleted file mode 100644 index 8fecc6a98..000000000 --- a/tests/preprocessor/include-a.spireh +++ /dev/null @@ -1,3 +0,0 @@ -// #include support - -int bar() { return foo(); } \ No newline at end of file diff --git a/tests/preprocessor/include.slang b/tests/preprocessor/include.slang new file mode 100644 index 000000000..e21d23877 --- /dev/null +++ b/tests/preprocessor/include.slang @@ -0,0 +1,8 @@ +//TEST:SIMPLE: +// #include support + +int foo() { return 0; } + +#include "include-a.slang.h" + +int baz() { return bar(); } \ No newline at end of file diff --git a/tests/preprocessor/include.spire b/tests/preprocessor/include.spire deleted file mode 100644 index 8feca21cc..000000000 --- a/tests/preprocessor/include.spire +++ /dev/null @@ -1,8 +0,0 @@ -//TEST:SIMPLE: -// #include support - -int foo() { return 0; } - -#include "include-a.spireh" - -int baz() { return bar(); } \ No newline at end of file -- cgit v1.2.3