From 416b5b44ed42021424815addc745775fcbf2a664 Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied@redhat.com>
Date: Wed, 13 Nov 2019 14:22:29 +1000
Subject: [PATCH] Fixup test running

---
 glslang.spec        |  3 +--
 glslang_tests.patch | 21 ---------------------
 2 files changed, 1 insertion(+), 23 deletions(-)
 delete mode 100644 glslang_tests.patch

diff --git a/glslang.spec b/glslang.spec
index 30bcb63..fe1cebd 100644
--- a/glslang.spec
+++ b/glslang.spec
@@ -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
 
diff --git a/glslang_tests.patch b/glslang_tests.patch
deleted file mode 100644
index 2561003..0000000
--- a/glslang_tests.patch
+++ /dev/null
@@ -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 $*
-