Fixup test running

This commit is contained in:
Dave Airlie 2019-11-13 14:22:29 +10:00
parent 95781c4513
commit 416b5b44ed
2 changed files with 1 additions and 23 deletions

View File

@ -12,7 +12,6 @@ License: BSD and GPLv3+ and ASL 2.0
URL: https://github.com/KhronosGroup
Source0: %url/%{name}/archive/%{commit}/%{name}-%{commit}.tar.gz
Patch1: glslang-default-resource-limits_staticlib.patch
Patch2: glslang_tests.patch
# Patch to build against system spirv-tools
Patch3: https://patch-diff.githubusercontent.com/raw/KhronosGroup/glslang/pull/1722.patch#/0001-pkg-config-compatibility.patch
@ -57,7 +56,7 @@ popd
%ifnarch s390x ppc64
%check
pushd Test
./runtests
./runtests localResults ../build/StandAlone/glslangValidator ../build/StandAlone/spirv-remap
popd
%endif

View File

@ -1,21 +0,0 @@
--- glslang-715c353a15836e5ae192a64a4cf54e2ce7e8d66a/Test/runtests
+++ glslang-715c353a15836e5ae192a64a4cf54e2ce7e8d66a-new/Test/runtests
@@ -2,8 +2,8 @@
TARGETDIR=localResults
BASEDIR=baseResults
-EXE=../build/install/bin/glslangValidator
-REMAPEXE=../build/install/bin/spirv-remap
+EXE=../build/StandAlone/glslangValidator
+REMAPEXE=../build/StandAlone/spirv-remap
HASERROR=0
mkdir -p localResults
--- glslang-715c353a15836e5ae192a64a4cf54e2ce7e8d66a/Test/glslangValidator
+++ glslang-715c353a15836e5ae192a64a4cf54e2ce7e8d66a-new/Test/glslangValidator
@@ -1,2 +1,2 @@
#!/usr/bin/env bash
-../build/install/bin/glslangValidator $*
+../build/StandAlone/glslangValidator $*