From 67b568f464ad8759104954b1c5943a27447231e2 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Wed, 28 Jul 2021 13:21:03 -0400 Subject: [PATCH] testsuite: Set TEST_RESULT_DIR for tools tests --- testsuite/tools/meson.build | 1 + testsuite/tools/simplify-3to4.in | 4 +++- testsuite/tools/simplify.in | 4 +++- testsuite/tools/validate.in | 4 +++- 4 files changed, 10 insertions(+), 3 deletions(-) diff --git a/testsuite/tools/meson.build b/testsuite/tools/meson.build index 6ad367586f..582bce6fb8 100644 --- a/testsuite/tools/meson.build +++ b/testsuite/tools/meson.build @@ -23,6 +23,7 @@ if bash.found() workdir: meson.current_build_dir(), protocol: 'tap', env: [ + 'TEST_RESULT_DIR=@0@'.format(join_paths(meson.current_build_dir(), 'output')), 'G_TEST_SRCDIR=@0@'.format(meson.current_source_dir()), 'G_TEST_BUILDDIR=@0@'.format(meson.current_build_dir()), 'GTK_A11Y=test', diff --git a/testsuite/tools/simplify-3to4.in b/testsuite/tools/simplify-3to4.in index 35b8a8272f..0a97f1afd8 100755 --- a/testsuite/tools/simplify-3to4.in +++ b/testsuite/tools/simplify-3to4.in @@ -2,7 +2,9 @@ GTK_BUILDER_TOOL=${GTK_BUILDER_TOOL:-gtk4-builder-tool} TEST_DATA_DIR=${G_TEST_SRCDIR:-.}/simplify-data-3to4 -TEST_RESULT_DIR=${TEST_RESULT_DIR:-/tmp} +TEST_RESULT_DIR=${TEST_RESULT_DIR:-/tmp}/simplify-3to4 + +mkdir -p "$TEST_RESULT_DIR" shopt -s nullglob TESTS=( "$TEST_DATA_DIR"/*.ui ) diff --git a/testsuite/tools/simplify.in b/testsuite/tools/simplify.in index e90437337b..12b4cea8ef 100755 --- a/testsuite/tools/simplify.in +++ b/testsuite/tools/simplify.in @@ -2,7 +2,9 @@ GTK_BUILDER_TOOL=${GTK_BUILDER_TOOL:-gtk4-builder-tool} TEST_DATA_DIR=${G_TEST_SRCDIR:-.}/simplify-data -TEST_RESULT_DIR=${TEST_RESULT_DIR:-/tmp} +TEST_RESULT_DIR=${TEST_RESULT_DIR:-/tmp}/simplify + +mkdir -p "$TEST_RESULT_DIR" shopt -s nullglob TESTS=( "$TEST_DATA_DIR"/*.ui ) diff --git a/testsuite/tools/validate.in b/testsuite/tools/validate.in index 82de80e31d..42048ef7b4 100755 --- a/testsuite/tools/validate.in +++ b/testsuite/tools/validate.in @@ -2,7 +2,9 @@ GTK_BUILDER_TOOL=${GTK_BUILDER_TOOL:-gtk4-builder-tool} TEST_DATA_DIR=${G_TEST_SRCDIR:-.}/validate-data -TEST_RESULT_DIR=${TEST_RESULT_DIR:-/tmp} +TEST_RESULT_DIR=${TEST_RESULT_DIR:-/tmp}/validate + +mkdir -p "$TEST_RESULT_DIR" shopt -s nullglob TESTS=( "$TEST_DATA_DIR"/*.ui )