[igt-dev] [PATCH i-g-t v2 4/4] run-tests.sh: use meson build by default

[Lucas De Marchi]

On Thu, Mar 15, 2018 at 4:50 AM, Petri Latvala <petri.latvala at intel.com> wrote:
> On Wed, Mar 14, 2018 at 05:59:10PM -0700, Lucas De Marchi wrote:
>> This makes scripts/run-tests.sh to look into a build dir by default,
>> looking for the test lists. With this we can run the script after
>> building i-g-t with meson without having to resort to the environment
>> variable.
>>
>> Signed-off-by: Lucas De Marchi <lucas.demarchi at intel.com>
>> ---
>>  scripts/run-tests.sh | 20 ++++++++++++++------
>>  1 file changed, 14 insertions(+), 6 deletions(-)
>>
>> diff --git a/scripts/run-tests.sh b/scripts/run-tests.sh
>> index 230250dd..fe153934 100755
>> --- a/scripts/run-tests.sh
>> +++ b/scripts/run-tests.sh
>> @@ -24,22 +24,30 @@
>>
>>  ROOT="`dirname $0`"
>>  ROOT="`readlink -f $ROOT/..`"
>> -IGT_TEST_ROOT="`readlink -f ${IGT_TEST_ROOT:-$ROOT/tests}`"
>>  IGT_CONFIG_PATH="`readlink -f ${IGT_CONFIG_PATH:-$HOME/.igtrc}`"
>>  RESULTS="$ROOT/results"
>>  PIGLIT=`which piglit 2> /dev/null`
>>
>> -if [ ! -d "$IGT_TEST_ROOT" ]; then
>> -     echo "Error: could not find tests directory."
>> -     exit 1
>> +if [ -z "$IGT_TEST_ROOT" ]; then
>> +     paths=("$ROOT/build/tests/test-list.txt"
>> +            "$ROOT/tests/test-list.txt")
>> +     for p in "${paths[@]}"; do
>> +             if [ -f "$p" ]; then
>> +                     echo "Found test list: \"$p\""
>
>
> I was first going to complain about printing too much crap but it's of
> course useful to know which one the script selected now that it's
> looking in multiple places.

yep, I didn't have the print and added it later as I found it useful.


> Reviewed-by: Petri Latvala <petri.latvala at intel.com>

thanks.
Btw, friendly ping on getting this applied.


Lucas De Marchi


>
>
>> +                     IGT_TEST_ROOT=$(dirname "$p")
>> +                     break
>> +             fi
>> +     done
>>  fi
>>
>> -if [ ! -f "$IGT_TEST_ROOT/test-list.txt" ]; then
>> +if [ -z "$IGT_TEST_ROOT" ]; then
>>       echo "Error: test list not found."
>> -     echo "Please run make in the tests directory to generate the test list."
>> +     echo "Please build tests to generate the test list or use IGT_TEST_ROOT env var."
>>       exit 1
>>  fi
>>
>> +IGT_TEST_ROOT="`readlink -f ${IGT_TEST_ROOT}`"
>> +
>>  function download_piglit {
>>       git clone git://anongit.freedesktop.org/piglit "$ROOT/piglit"
>>  }
>> --
>> 2.14.3
>>
> _______________________________________________
> igt-dev mailing list
> igt-dev at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/igt-dev



-- 
Lucas De Marchi