From 7ccac5e8a4a0fd123eb8c035225ee12d30c0bb00 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Thu, 17 Dec 2015 07:59:05 +0100
Subject: testsuite subdir fix

Signed-off-by: Leonid Lisovskiy <lly.dev@gmail.com>
Signed-off-by: Waldemar Brodkorb <wbx@uclibc-ng.org>
---
 test/Test.mak | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/test/Test.mak b/test/Test.mak
index 52992a70a..a82505f2b 100644
--- a/test/Test.mak
+++ b/test/Test.mak
@@ -45,6 +45,9 @@ U_TARGETS += $(TESTS_DISABLED)
 G_TARGETS += $(addsuffix _glibc,$(TESTS_DISABLED)) $(GLIBC_TESTS_DISABLED)
 TARGETS += $(SHELL_TESTS)
 CFLAGS += $(CFLAGS_$(notdir $(CURDIR)))
+ifeq (1,$(UCLIBCNG_GENERATE_TESTRUNNER))
+UCLIBCNG_TEST_SUBDIR ?= $(patsubst $(realpath $(TESTDIR))/%,%,$(CURDIR))
+endif
 
 define binary_name
 $(patsubst %.exe,%,$@)
@@ -92,6 +95,7 @@ $(addsuffix .exe,$(U_TARGETS)): SIMULATOR:=$(SIMULATOR_uclibc)
 $(addsuffix .exe,$(G_TARGETS)): SIMULATOR:=$(SIMULATOR_glibc)
 $(RUN_TARGETS):
 ifeq (1,$(UCLIBCNG_GENERATE_TESTRUNNER))
+	$(Q)\
 	expected_ret="$(RET_$(tst_src_name))"; echo \
 	    "$${expected_ret:-0}" \
 	    $(call shellescape,$(tst_src_name)) \
-- 
cgit v1.2.3