From b7c0b61782251c1dedb0b0fb0e6654af81249910 Mon Sep 17 00:00:00 2001
From: Vinson Lee <vlee@freedesktop.org>
Date: Fri, 11 Oct 2013 18:33:08 -0700
Subject: [PATCH] glsl: Use more portable bash invocation construct.

Fixes 'make check' on distros where bash is not at /bin/bash.

Signed-off-by: Vinson Lee <vlee@freedesktop.org>
Reviewed-by: Brian Paul <brianp@vmware.com>
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
Tested-by: Ian Romanick <ian.d.romanick@intel.com>
---
 src/glsl/tests/lower_jumps/create_test_cases.py                 | 2 +-
 src/glsl/tests/lower_jumps/lower_breaks_1.opt_test              | 2 +-
 src/glsl/tests/lower_jumps/lower_breaks_2.opt_test              | 2 +-
 src/glsl/tests/lower_jumps/lower_breaks_3.opt_test              | 2 +-
 src/glsl/tests/lower_jumps/lower_breaks_4.opt_test              | 2 +-
 src/glsl/tests/lower_jumps/lower_breaks_5.opt_test              | 2 +-
 src/glsl/tests/lower_jumps/lower_breaks_6.opt_test              | 2 +-
 .../tests/lower_jumps/lower_guarded_conditional_break.opt_test  | 2 +-
 src/glsl/tests/lower_jumps/lower_pulled_out_jump.opt_test       | 2 +-
 src/glsl/tests/lower_jumps/lower_returns_1.opt_test             | 2 +-
 src/glsl/tests/lower_jumps/lower_returns_2.opt_test             | 2 +-
 src/glsl/tests/lower_jumps/lower_returns_3.opt_test             | 2 +-
 src/glsl/tests/lower_jumps/lower_returns_4.opt_test             | 2 +-
 src/glsl/tests/lower_jumps/lower_returns_main_false.opt_test    | 2 +-
 src/glsl/tests/lower_jumps/lower_returns_main_true.opt_test     | 2 +-
 src/glsl/tests/lower_jumps/lower_returns_sub_false.opt_test     | 2 +-
 src/glsl/tests/lower_jumps/lower_returns_sub_true.opt_test      | 2 +-
 src/glsl/tests/lower_jumps/lower_unified_returns.opt_test       | 2 +-
 .../tests/lower_jumps/remove_continue_at_end_of_loop.opt_test   | 2 +-
 .../return_non_void_at_end_of_loop_lower_nothing.opt_test       | 2 +-
 .../return_non_void_at_end_of_loop_lower_return.opt_test        | 2 +-
 ...turn_non_void_at_end_of_loop_lower_return_and_break.opt_test | 2 +-
 .../return_void_at_end_of_loop_lower_nothing.opt_test           | 2 +-
 .../return_void_at_end_of_loop_lower_return.opt_test            | 2 +-
 .../return_void_at_end_of_loop_lower_return_and_break.opt_test  | 2 +-
 src/glsl/tests/optimization-test                                | 2 +-
 26 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/src/glsl/tests/lower_jumps/create_test_cases.py b/src/glsl/tests/lower_jumps/create_test_cases.py
index fbc6f0a84ea..9974681e02f 100644
--- a/src/glsl/tests/lower_jumps/create_test_cases.py
+++ b/src/glsl/tests/lower_jumps/create_test_cases.py
@@ -291,7 +291,7 @@ def create_test_case(doc_string, input_sexp, expected_sexp, test_name,
     args = ['../../glsl_test', 'optpass', '--quiet', '--input-ir', optimization]
     test_file = '{0}.opt_test'.format(test_name)
     with open(test_file, 'w') as f:
-        f.write('#!/bin/bash\n#\n# This file was generated by create_test_cases.py.\n#\n')
+        f.write('#!/usr/bin/env bash\n#\n# This file was generated by create_test_cases.py.\n#\n')
         f.write(doc_string)
         f.write('{0} <<EOF\n'.format(bash_quote(*args)))
         f.write('{0}\nEOF\n'.format(input_str))
diff --git a/src/glsl/tests/lower_jumps/lower_breaks_1.opt_test b/src/glsl/tests/lower_jumps/lower_breaks_1.opt_test
index 01ad7087a28..dc9cf8f1a60 100755
--- a/src/glsl/tests/lower_jumps/lower_breaks_1.opt_test
+++ b/src/glsl/tests/lower_jumps/lower_breaks_1.opt_test
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # This file was generated by create_test_cases.py.
 #
diff --git a/src/glsl/tests/lower_jumps/lower_breaks_2.opt_test b/src/glsl/tests/lower_jumps/lower_breaks_2.opt_test
index 0be22f953e1..9b297daf14e 100755
--- a/src/glsl/tests/lower_jumps/lower_breaks_2.opt_test
+++ b/src/glsl/tests/lower_jumps/lower_breaks_2.opt_test
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # This file was generated by create_test_cases.py.
 #
diff --git a/src/glsl/tests/lower_jumps/lower_breaks_3.opt_test b/src/glsl/tests/lower_jumps/lower_breaks_3.opt_test
index 4149360b5d0..366e23093a7 100755
--- a/src/glsl/tests/lower_jumps/lower_breaks_3.opt_test
+++ b/src/glsl/tests/lower_jumps/lower_breaks_3.opt_test
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # This file was generated by create_test_cases.py.
 #
diff --git a/src/glsl/tests/lower_jumps/lower_breaks_4.opt_test b/src/glsl/tests/lower_jumps/lower_breaks_4.opt_test
index 70458bb4f8e..350ad628fb3 100755
--- a/src/glsl/tests/lower_jumps/lower_breaks_4.opt_test
+++ b/src/glsl/tests/lower_jumps/lower_breaks_4.opt_test
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # This file was generated by create_test_cases.py.
 #
diff --git a/src/glsl/tests/lower_jumps/lower_breaks_5.opt_test b/src/glsl/tests/lower_jumps/lower_breaks_5.opt_test
index da9eef1105e..72b20720572 100755
--- a/src/glsl/tests/lower_jumps/lower_breaks_5.opt_test
+++ b/src/glsl/tests/lower_jumps/lower_breaks_5.opt_test
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # This file was generated by create_test_cases.py.
 #
diff --git a/src/glsl/tests/lower_jumps/lower_breaks_6.opt_test b/src/glsl/tests/lower_jumps/lower_breaks_6.opt_test
index 9440dfec897..711ab87218d 100755
--- a/src/glsl/tests/lower_jumps/lower_breaks_6.opt_test
+++ b/src/glsl/tests/lower_jumps/lower_breaks_6.opt_test
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # This file was generated by create_test_cases.py.
 #
diff --git a/src/glsl/tests/lower_jumps/lower_guarded_conditional_break.opt_test b/src/glsl/tests/lower_jumps/lower_guarded_conditional_break.opt_test
index 379aa59b5a2..a63306931ca 100755
--- a/src/glsl/tests/lower_jumps/lower_guarded_conditional_break.opt_test
+++ b/src/glsl/tests/lower_jumps/lower_guarded_conditional_break.opt_test
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # This file was generated by create_test_cases.py.
 #
diff --git a/src/glsl/tests/lower_jumps/lower_pulled_out_jump.opt_test b/src/glsl/tests/lower_jumps/lower_pulled_out_jump.opt_test
index 15f3c41d5a2..eeae6fd6f9e 100755
--- a/src/glsl/tests/lower_jumps/lower_pulled_out_jump.opt_test
+++ b/src/glsl/tests/lower_jumps/lower_pulled_out_jump.opt_test
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # This file was generated by create_test_cases.py.
 #
diff --git a/src/glsl/tests/lower_jumps/lower_returns_1.opt_test b/src/glsl/tests/lower_jumps/lower_returns_1.opt_test
index a1f895bbf78..e73c51208ad 100755
--- a/src/glsl/tests/lower_jumps/lower_returns_1.opt_test
+++ b/src/glsl/tests/lower_jumps/lower_returns_1.opt_test
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # This file was generated by create_test_cases.py.
 #
diff --git a/src/glsl/tests/lower_jumps/lower_returns_2.opt_test b/src/glsl/tests/lower_jumps/lower_returns_2.opt_test
index 61673d4ef66..da2dc7ee299 100755
--- a/src/glsl/tests/lower_jumps/lower_returns_2.opt_test
+++ b/src/glsl/tests/lower_jumps/lower_returns_2.opt_test
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # This file was generated by create_test_cases.py.
 #
diff --git a/src/glsl/tests/lower_jumps/lower_returns_3.opt_test b/src/glsl/tests/lower_jumps/lower_returns_3.opt_test
index 9881e249270..9509781fe85 100755
--- a/src/glsl/tests/lower_jumps/lower_returns_3.opt_test
+++ b/src/glsl/tests/lower_jumps/lower_returns_3.opt_test
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # This file was generated by create_test_cases.py.
 #
diff --git a/src/glsl/tests/lower_jumps/lower_returns_4.opt_test b/src/glsl/tests/lower_jumps/lower_returns_4.opt_test
index 9f54c67a180..c5bb9c89847 100755
--- a/src/glsl/tests/lower_jumps/lower_returns_4.opt_test
+++ b/src/glsl/tests/lower_jumps/lower_returns_4.opt_test
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # This file was generated by create_test_cases.py.
 #
diff --git a/src/glsl/tests/lower_jumps/lower_returns_main_false.opt_test b/src/glsl/tests/lower_jumps/lower_returns_main_false.opt_test
index 5f97bfd3f5a..fdb1d0ed28b 100755
--- a/src/glsl/tests/lower_jumps/lower_returns_main_false.opt_test
+++ b/src/glsl/tests/lower_jumps/lower_returns_main_false.opt_test
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # This file was generated by create_test_cases.py.
 #
diff --git a/src/glsl/tests/lower_jumps/lower_returns_main_true.opt_test b/src/glsl/tests/lower_jumps/lower_returns_main_true.opt_test
index 59c7ba1dd52..939ec8b0e4e 100755
--- a/src/glsl/tests/lower_jumps/lower_returns_main_true.opt_test
+++ b/src/glsl/tests/lower_jumps/lower_returns_main_true.opt_test
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # This file was generated by create_test_cases.py.
 #
diff --git a/src/glsl/tests/lower_jumps/lower_returns_sub_false.opt_test b/src/glsl/tests/lower_jumps/lower_returns_sub_false.opt_test
index 40e784e3318..92a4e8a6297 100755
--- a/src/glsl/tests/lower_jumps/lower_returns_sub_false.opt_test
+++ b/src/glsl/tests/lower_jumps/lower_returns_sub_false.opt_test
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # This file was generated by create_test_cases.py.
 #
diff --git a/src/glsl/tests/lower_jumps/lower_returns_sub_true.opt_test b/src/glsl/tests/lower_jumps/lower_returns_sub_true.opt_test
index 9fe6b90f085..789414ecbc7 100755
--- a/src/glsl/tests/lower_jumps/lower_returns_sub_true.opt_test
+++ b/src/glsl/tests/lower_jumps/lower_returns_sub_true.opt_test
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # This file was generated by create_test_cases.py.
 #
diff --git a/src/glsl/tests/lower_jumps/lower_unified_returns.opt_test b/src/glsl/tests/lower_jumps/lower_unified_returns.opt_test
index e7168131487..5d6e51cff9b 100755
--- a/src/glsl/tests/lower_jumps/lower_unified_returns.opt_test
+++ b/src/glsl/tests/lower_jumps/lower_unified_returns.opt_test
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # This file was generated by create_test_cases.py.
 #
diff --git a/src/glsl/tests/lower_jumps/remove_continue_at_end_of_loop.opt_test b/src/glsl/tests/lower_jumps/remove_continue_at_end_of_loop.opt_test
index 18efc37f6e1..ceb010c7c65 100755
--- a/src/glsl/tests/lower_jumps/remove_continue_at_end_of_loop.opt_test
+++ b/src/glsl/tests/lower_jumps/remove_continue_at_end_of_loop.opt_test
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # This file was generated by create_test_cases.py.
 #
diff --git a/src/glsl/tests/lower_jumps/return_non_void_at_end_of_loop_lower_nothing.opt_test b/src/glsl/tests/lower_jumps/return_non_void_at_end_of_loop_lower_nothing.opt_test
index 79c0e824512..a93167b645c 100755
--- a/src/glsl/tests/lower_jumps/return_non_void_at_end_of_loop_lower_nothing.opt_test
+++ b/src/glsl/tests/lower_jumps/return_non_void_at_end_of_loop_lower_nothing.opt_test
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # This file was generated by create_test_cases.py.
 #
diff --git a/src/glsl/tests/lower_jumps/return_non_void_at_end_of_loop_lower_return.opt_test b/src/glsl/tests/lower_jumps/return_non_void_at_end_of_loop_lower_return.opt_test
index 920d2ad9fba..9ce33f0ac2e 100755
--- a/src/glsl/tests/lower_jumps/return_non_void_at_end_of_loop_lower_return.opt_test
+++ b/src/glsl/tests/lower_jumps/return_non_void_at_end_of_loop_lower_return.opt_test
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # This file was generated by create_test_cases.py.
 #
diff --git a/src/glsl/tests/lower_jumps/return_non_void_at_end_of_loop_lower_return_and_break.opt_test b/src/glsl/tests/lower_jumps/return_non_void_at_end_of_loop_lower_return_and_break.opt_test
index 99f1f863506..06988c29571 100755
--- a/src/glsl/tests/lower_jumps/return_non_void_at_end_of_loop_lower_return_and_break.opt_test
+++ b/src/glsl/tests/lower_jumps/return_non_void_at_end_of_loop_lower_return_and_break.opt_test
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # This file was generated by create_test_cases.py.
 #
diff --git a/src/glsl/tests/lower_jumps/return_void_at_end_of_loop_lower_nothing.opt_test b/src/glsl/tests/lower_jumps/return_void_at_end_of_loop_lower_nothing.opt_test
index 63487d32691..45699a897e4 100755
--- a/src/glsl/tests/lower_jumps/return_void_at_end_of_loop_lower_nothing.opt_test
+++ b/src/glsl/tests/lower_jumps/return_void_at_end_of_loop_lower_nothing.opt_test
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # This file was generated by create_test_cases.py.
 #
diff --git a/src/glsl/tests/lower_jumps/return_void_at_end_of_loop_lower_return.opt_test b/src/glsl/tests/lower_jumps/return_void_at_end_of_loop_lower_return.opt_test
index 523c92a686d..abfa582c291 100755
--- a/src/glsl/tests/lower_jumps/return_void_at_end_of_loop_lower_return.opt_test
+++ b/src/glsl/tests/lower_jumps/return_void_at_end_of_loop_lower_return.opt_test
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # This file was generated by create_test_cases.py.
 #
diff --git a/src/glsl/tests/lower_jumps/return_void_at_end_of_loop_lower_return_and_break.opt_test b/src/glsl/tests/lower_jumps/return_void_at_end_of_loop_lower_return_and_break.opt_test
index 22b5581cbda..a8c5e379136 100755
--- a/src/glsl/tests/lower_jumps/return_void_at_end_of_loop_lower_return_and_break.opt_test
+++ b/src/glsl/tests/lower_jumps/return_void_at_end_of_loop_lower_return_and_break.opt_test
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # This file was generated by create_test_cases.py.
 #
diff --git a/src/glsl/tests/optimization-test b/src/glsl/tests/optimization-test
index 59383f8f912..8ca7776919f 100755
--- a/src/glsl/tests/optimization-test
+++ b/src/glsl/tests/optimization-test
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 if [ ! -z "$srcdir" ]; then
    compare_ir=`pwd`/tests/compare_ir
-- 
2.30.2