From 3c7e1be0098f963225afd0ebe83340a991392892 Mon Sep 17 00:00:00 2001 From: jsmall-nvidia Date: Thu, 17 Jan 2019 17:50:48 -0500 Subject: Feature/hash for source identity (#786) * * Added COMMAND_LINE_SIMPLE test type * Made how spawning works controllable by paramter/type SpawnType * Made break-outside-loop and global-uniform run command line slangc * calcRelativePath -> calcCombinedPath * Add 64 bit version of GetHash. * Add support for Hash based mode for CacheFileSystem. --- tests/diagnostics/break-outside-loop.slang | 2 ++ tests/diagnostics/break-outside-loop.slang.expected | 2 +- tests/diagnostics/global-uniform.slang | 2 +- tests/preprocessor/pragma-once.slang | 4 ++++ 4 files changed, 8 insertions(+), 2 deletions(-) (limited to 'tests') diff --git a/tests/diagnostics/break-outside-loop.slang b/tests/diagnostics/break-outside-loop.slang index f86b0bad6..0de64e2c5 100644 --- a/tests/diagnostics/break-outside-loop.slang +++ b/tests/diagnostics/break-outside-loop.slang @@ -1,4 +1,6 @@ //TEST:SIMPLE: +//TEST:COMMAND_LINE_SIMPLE: + // `break` where it isn't allowed void foo() { break; } diff --git a/tests/diagnostics/break-outside-loop.slang.expected b/tests/diagnostics/break-outside-loop.slang.expected index 80d79537b..94af34382 100644 --- a/tests/diagnostics/break-outside-loop.slang.expected +++ b/tests/diagnostics/break-outside-loop.slang.expected @@ -1,6 +1,6 @@ result code = -1 standard error = { -tests/diagnostics/break-outside-loop.slang(4): error 30003: 'break' must appear inside loop constructs. +tests/diagnostics/break-outside-loop.slang(6): error 30003: 'break' must appear inside loop constructs. } standard output = { } diff --git a/tests/diagnostics/global-uniform.slang b/tests/diagnostics/global-uniform.slang index a3f17e536..6d3189cbc 100644 --- a/tests/diagnostics/global-uniform.slang +++ b/tests/diagnostics/global-uniform.slang @@ -1,6 +1,6 @@ // global-uniform.slang //TEST:SIMPLE:-target hlsl - +//TEST:COMMAND_LINE_SIMPLE:-target hlsl // Any attempt to declare a global variable that actually declares a // global uniform should be diagnosed as unsupported. diff --git a/tests/preprocessor/pragma-once.slang b/tests/preprocessor/pragma-once.slang index fe805f82f..02db6e3b3 100644 --- a/tests/preprocessor/pragma-once.slang +++ b/tests/preprocessor/pragma-once.slang @@ -27,6 +27,10 @@ #include "pragma-once-a.h" #include "pragma-once-b.h" +// Make sure relative paths are handled +#include "./pragma-once-a.h" +#include "./pragma-once-a.h" + // Now let's use both the function and the // macro, to confirm that they are both // defined as expected. -- cgit v1.2.3