summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorTim Foley <tfoleyNV@users.noreply.github.com>2017-09-29 13:43:08 -0700
committerGitHub <noreply@github.com>2017-09-29 13:43:08 -0700
commit8a0ebb9fa25fd44def17b03b3f8aa1a33ad77940 (patch)
tree3f855c1f8057e53763cb083c3b898effb559b80b /tests
parent74f2f47cb63b02638270beecd20acea1a0f5665e (diff)
Get tests running/passing under Linux (#194)
* Get tests running/passing under Linux - Fix up `dlopen` abstraction - Fix up some test cases to request hlsl (rather than default to dxbc) so they can run on non-Windows targets - Fix up test runner ignore tests that can't run on current platform (and not count those as failure) - Fix file handle leeak in process spawner absttraction - Get additional test-related applications building - More tweaks to Travis script; in theory deployment is set up now (yeah, right) * fixup * fixup: Travis environment variable syntax * fixup: Buffer->begin * fixup: actually run full tests on one config * fixup: add build status badge for Travis
Diffstat (limited to 'tests')
-rw-r--r--tests/reflection/arrays.hlsl2
-rw-r--r--tests/reflection/gh-55.glsl2
-rw-r--r--tests/reflection/global-uniforms.hlsl2
-rw-r--r--tests/reflection/image-types.glsl2
-rw-r--r--tests/reflection/multi-file.hlsl2
-rw-r--r--tests/reflection/reflect-imported-code.hlsl2
-rw-r--r--tests/reflection/reflection0.hlsl2
-rw-r--r--tests/reflection/resource-in-cbuffer.hlsl2
-rw-r--r--tests/reflection/std430-layout.glsl2
-rw-r--r--tests/reflection/thread-group-size.comp2
-rw-r--r--tests/reflection/thread-group-size.hlsl2
11 files changed, 11 insertions, 11 deletions
diff --git a/tests/reflection/arrays.hlsl b/tests/reflection/arrays.hlsl
index 8880aaebd..3ef512d31 100644
--- a/tests/reflection/arrays.hlsl
+++ b/tests/reflection/arrays.hlsl
@@ -1,4 +1,4 @@
-//TEST:SIMPLE:-profile ps_4_0 -target reflection-json
+//TEST:SIMPLE:-profile ps_4_0 -target hlsl -target reflection-json
// Confirm that we can generate reflection info for arrays
//
diff --git a/tests/reflection/gh-55.glsl b/tests/reflection/gh-55.glsl
index 4ced68c9e..ab8177c77 100644
--- a/tests/reflection/gh-55.glsl
+++ b/tests/reflection/gh-55.glsl
@@ -1,4 +1,4 @@
-//TEST(smoke):SIMPLE:-profile ps_4_0 -target reflection-json
+//TEST(smoke):SIMPLE:-profile ps_4_0 -target glsl -target reflection-json
// Confirm fix for GitHub issue #55
diff --git a/tests/reflection/global-uniforms.hlsl b/tests/reflection/global-uniforms.hlsl
index 7845af4b6..4ad1a4bbb 100644
--- a/tests/reflection/global-uniforms.hlsl
+++ b/tests/reflection/global-uniforms.hlsl
@@ -1,4 +1,4 @@
-//TEST:SIMPLE:-profile ps_4_0 -target reflection-json
+//TEST:SIMPLE:-profile ps_4_0 -target hlsl -target reflection-json
// Confirm that we handle uniforms at global scope
diff --git a/tests/reflection/image-types.glsl b/tests/reflection/image-types.glsl
index 73ecdaa82..bf7c396af 100644
--- a/tests/reflection/image-types.glsl
+++ b/tests/reflection/image-types.glsl
@@ -1,4 +1,4 @@
-//TEST(smoke):SIMPLE:-profile ps_4_0 -target reflection-json
+//TEST(smoke):SIMPLE:-profile ps_4_0 -target glsl -target reflection-json
// Confirm that we expose GLSL `image` types through reflection
diff --git a/tests/reflection/multi-file.hlsl b/tests/reflection/multi-file.hlsl
index 7f79f08c9..47264f2ec 100644
--- a/tests/reflection/multi-file.hlsl
+++ b/tests/reflection/multi-file.hlsl
@@ -1,4 +1,4 @@
-//TEST:SIMPLE:-profile ps_4_0 -entry mainFS -target reflection-json tests/reflection/multi-file-extra.hlsl -profile vs_4_0 -entry mainVS
+//TEST:SIMPLE:-profile ps_4_0 -entry mainFS -target hlsl -target reflection-json tests/reflection/multi-file-extra.hlsl -profile vs_4_0 -entry mainVS
// Here we are testing the case where multiple translation units are provided
// at once, so that we want combined reflection information for the resulting
diff --git a/tests/reflection/reflect-imported-code.hlsl b/tests/reflection/reflect-imported-code.hlsl
index b95493f7e..04f58af19 100644
--- a/tests/reflection/reflect-imported-code.hlsl
+++ b/tests/reflection/reflect-imported-code.hlsl
@@ -1,4 +1,4 @@
-//TEST:SIMPLE:-profile ps_4_0 -target reflection-json
+//TEST:SIMPLE:-profile ps_4_0 -target hlsl -target reflection-json
// Confirm that shader parameters in imported modules get reflected properly.
diff --git a/tests/reflection/reflection0.hlsl b/tests/reflection/reflection0.hlsl
index 1f138894f..944bb795e 100644
--- a/tests/reflection/reflection0.hlsl
+++ b/tests/reflection/reflection0.hlsl
@@ -1,4 +1,4 @@
-//TEST:SIMPLE:-profile ps_4_0 -target reflection-json
+//TEST:SIMPLE:-profile ps_4_0 -target hlsl -target reflection-json
// Confirm that basic reflection info can be output
diff --git a/tests/reflection/resource-in-cbuffer.hlsl b/tests/reflection/resource-in-cbuffer.hlsl
index 9ab127363..b54399bd7 100644
--- a/tests/reflection/resource-in-cbuffer.hlsl
+++ b/tests/reflection/resource-in-cbuffer.hlsl
@@ -1,4 +1,4 @@
-//TEST(smoke):SIMPLE:-profile ps_4_0 -target reflection-json
+//TEST(smoke):SIMPLE:-profile ps_4_0 -target hlsl -target reflection-json
// Confirm that we can generate reflection
// information for resources nested inside
diff --git a/tests/reflection/std430-layout.glsl b/tests/reflection/std430-layout.glsl
index 0e61556fc..8afda8e0c 100644
--- a/tests/reflection/std430-layout.glsl
+++ b/tests/reflection/std430-layout.glsl
@@ -1,5 +1,5 @@
#version 450
-//TEST(smoke):SIMPLE:-profile ps_4_0 -target reflection-json
+//TEST(smoke):SIMPLE:-profile ps_4_0 -target glsl -target reflection-json
// Confirm fix for GitHub issue #55
diff --git a/tests/reflection/thread-group-size.comp b/tests/reflection/thread-group-size.comp
index 2edf2c2df..fac755433 100644
--- a/tests/reflection/thread-group-size.comp
+++ b/tests/reflection/thread-group-size.comp
@@ -1,4 +1,4 @@
-//TEST:SIMPLE:-no-checking -target reflection-json
+//TEST:SIMPLE:-no-checking -target glsl -target reflection-json
// Confirm that we provide reflection data for the `local_size_*` attributes
diff --git a/tests/reflection/thread-group-size.hlsl b/tests/reflection/thread-group-size.hlsl
index 650a41e46..eb2fb98ad 100644
--- a/tests/reflection/thread-group-size.hlsl
+++ b/tests/reflection/thread-group-size.hlsl
@@ -1,4 +1,4 @@
-//TEST:SIMPLE:-profile cs_5_0 -target reflection-json
+//TEST:SIMPLE:-profile cs_5_0 -target hlsl -target reflection-json
// Confirm that we provide reflection data for the `numthreads` attribute