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

[Petri Latvala]

On Tue, Mar 20, 2018 at 02:45:44PM -0700, Lucas De Marchi wrote:
> 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.


Merged, thanks for the ping.

-- 
Petri Latvala