diff options
| author | Yongqin Liu <yongqin.liu@linaro.org> | 2018-06-27 21:37:13 +0800 |
|---|---|---|
| committer | Yongqin Liu <yongqin.liu@linaro.org> | 2018-06-27 14:02:14 +0000 |
| commit | 3e244144e2a6a1a6a923a070b98472fdda0eab46 (patch) | |
| tree | fa56969cae7eaf3fcf111d58c99d84c447deb1e7 /automated | |
| parent | 08fb5d99b9a338f2067085698b973439b0c50da8 (diff) | |
piglit related tests: update to use files under /vendor or /data/vendor
since the related binary or test data files are move to /vendor or /data/vendor
to support Treble enabled builds
Change-Id: I254e147580047b90f0230434eadaeb13f0b415e1
Signed-off-by: Yongqin Liu <yongqin.liu@linaro.org>
Diffstat (limited to 'automated')
4 files changed, 9 insertions, 9 deletions
diff --git a/automated/android/piglit-gles2/device-script.sh b/automated/android/piglit-gles2/device-script.sh index db1544da..007f6047 100755 --- a/automated/android/piglit-gles2/device-script.sh +++ b/automated/android/piglit-gles2/device-script.sh @@ -30,7 +30,7 @@ PSTRING='PIGLIT: {"result": "pass"' SSTRING='PIGLIT: {"result": "skip"' FSTRING='PIGLIT: {"result": "fail"' -gles2_bin_dir="/system/xbin/piglit/piglit-spec-gles2" +gles2_bin_dir="/vendor/bin/" normal_test(){ cmd="${gles2_bin_dir}/$1" diff --git a/automated/android/piglit-gles3/device-script.sh b/automated/android/piglit-gles3/device-script.sh index e655d577..99295d94 100755 --- a/automated/android/piglit-gles3/device-script.sh +++ b/automated/android/piglit-gles3/device-script.sh @@ -30,7 +30,7 @@ PSTRING='PIGLIT: {"result": "pass"' SSTRING='PIGLIT: {"result": "skip"' FSTRING='PIGLIT: {"result": "fail"' -gles3_bin_dir=/system/xbin/piglit/piglit-spec-gles3 +gles3_bin_dir=/vendor/bin normal_test(){ cmd="${gles3_bin_dir}/$1" @@ -45,7 +45,7 @@ normal_test(){ } test_oes_compressed_etc2_texture_miptree_gles3(){ - PIGLIT_SOURCE_DIR="/data/piglit" + PIGLIT_SOURCE_DIR="/data/vendor/piglit" export PIGLIT_SOURCE_DIR cmd="${gles3_bin_dir}/oes_compressed_etc2_texture-miptree_gles3" test_base_name="oes_compressed_etc2_texture-miptree_gles3" diff --git a/automated/android/piglit-glslparser/device-script.sh b/automated/android/piglit-glslparser/device-script.sh index c61ef5ab..2dce26e5 100755 --- a/automated/android/piglit-glslparser/device-script.sh +++ b/automated/android/piglit-glslparser/device-script.sh @@ -27,9 +27,9 @@ # looks recursively down the directory tree PIGLIT_PLATFORM=android export PIGLIT_PLATFORM -bin_path="/system/xbin/piglit/glslparsertest/glslparsertest" -data_dir="/data/piglit/glslparser/" -/system/bin/busybox find ${data_dir} -name "*.frag" -or -name "*.vert" | while read -r file +bin_path="/vendor/bin/glslparsertest" +data_dir="/data/vendor/piglit/glslparser/" +find ${data_dir} -name "*.frag" -or -name "*.vert" | while read -r file do RESULTFOUND=$(grep expect_result "${file}") case $RESULTFOUND in diff --git a/automated/android/piglit-shader-runner/device-script.sh b/automated/android/piglit-shader-runner/device-script.sh index 1d18f3b9..b63bf26d 100755 --- a/automated/android/piglit-shader-runner/device-script.sh +++ b/automated/android/piglit-shader-runner/device-script.sh @@ -29,13 +29,13 @@ PIGLIT_PLATFORM=android export PIGLIT_PLATFORM -bin_path="/system/xbin/piglit/piglit-shader-test/shader_runner" -data_dir="/data/piglit/shader" +bin_path="/vendor/bin/shader_runner" +data_dir="/data/vendor/piglit/shader" # glsl_es1_data_dir="${data_dir}/glsl-es-1.00/" # glsl_es3_data_dir="${data_dir}/glsl-es-3.00/" # shellcheck disable=SC2035 -/system/bin/busybox find ${data_dir} -name *.shader_test | while read -r file +find ${data_dir} -name "*.shader_test" | while read -r file do RESULT=$(${bin_path} "${file}" -auto ) |