diff options
| author | Carl Worth <cworth@cworth.org> | 2014-07-02 22:58:57 -0700 |
|---|---|---|
| committer | Ian Romanick <ian.d.romanick@intel.com> | 2014-08-07 16:08:29 -0700 |
| commit | 7ba74c65a77afbfb2da8515fcae51c19618c7b18 (patch) | |
| tree | bd84f7cd407f032e21dc4940582029e8a22a91c3 /src/glsl/glcpp | |
| parent | f1340745c00617bead8352d314306642138ed0bd (diff) | |
| download | external_mesa3d-7ba74c65a77afbfb2da8515fcae51c19618c7b18.zip external_mesa3d-7ba74c65a77afbfb2da8515fcae51c19618c7b18.tar.gz external_mesa3d-7ba74c65a77afbfb2da8515fcae51c19618c7b18.tar.bz2 | |
glsl/glcpp: Fix glcpp-test to correctly extract test-specific arguments
The (optional) test-specific command-line arguments to be passed to glcpp are
embedded within the source files of some tests, and glcpp-test uses grep to
extract them.
Of course, grep is line-based and looks for the native line-separator to
determine line boundaries. So, for files using non-native line separators,
grep was getting quite confused and passing bogus arguments to glcpp.
Fix this by canonical-izing the line separators in the source file prior to
using grep.
With this commit, the glcpp-test-cr-lf tests pass entirely:
\r: 143/143 tests pass
\r\n: 143/143 tests pass
\n\r: 143/143 tests pass
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
Diffstat (limited to 'src/glsl/glcpp')
| -rwxr-xr-x | src/glsl/glcpp/tests/glcpp-test | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/glsl/glcpp/tests/glcpp-test b/src/glsl/glcpp/tests/glcpp-test index 9bf7bdb..640f576 100755 --- a/src/glsl/glcpp/tests/glcpp-test +++ b/src/glsl/glcpp/tests/glcpp-test @@ -28,7 +28,7 @@ test_specific_args () { test="$1" - grep 'glcpp-args:' "$test" | sed -e 's,^.*glcpp-args: *,,' + tr "\r" "\n" < "$test" | grep 'glcpp-args:' | sed -e 's,^.*glcpp-args: *,,' } # Parse command-line options |