use TARGET_ARCH everywhere

Disable some test for metag to allow runtime testing again.
Rename the big math meta-data files and do not install them.

Cris and Metag can be runtime tested again.

8 files changed, 10 insertions, 5 deletions

diff --git a/test/math/auto-libm-test-in b/test/math/auto-libm-test-in.m
index ffcc40a..ffcc40a 100644
--- a/test/math/auto-libm-test-in
+++ b/test/math/auto-libm-test-in.m
diff --git a/test/math/auto-libm-test-out b/test/math/auto-libm-test-out.m
index c07978e..c07978e 100644
--- a/test/math/auto-libm-test-out
+++ b/test/math/auto-libm-test-out.m
diff --git a/test/math/gen-libm-test.pl b/test/math/gen-libm-test.pl
index fc56eb8..3c3e621 100755
--- a/test/math/gen-libm-test.pl
+++ b/test/math/gen-libm-test.pl
@@ -97,7 +97,7 @@ $ulps_file = $opt_u if ($opt_u);
 $output_dir = $opt_o if ($opt_o);
 
 $input = "libm-test.inc";
-$auto_input = "${srcdir}auto-libm-test-out";
+$auto_input = "${srcdir}auto-libm-test-out.m";
 $output = "${output_dir}libm-test.c";
 
 &parse_ulps ($ulps_file);
diff --git a/test/misc/Makefile.in b/test/misc/Makefile.in
index 9788697..a97b124 100644
--- a/test/misc/Makefile.in
+++ b/test/misc/Makefile.in
@@ -3,7 +3,7 @@
 
 TESTS_DISABLED := outb tst-fnmatch bug-glob1 tst-gnuglob
 
-ifeq ($(TARGET_avr32),y)
+ifeq ($(TARGET_ARCH),avr32)
 TESTS_DISABLED += tst-inotify
 endif
 
diff --git a/test/nptl/Makefile.in b/test/nptl/Makefile.in
index a82eef1..a19621f 100644
--- a/test/nptl/Makefile.in
+++ b/test/nptl/Makefile.in
@@ -1,6 +1,10 @@
 # uClibc-ng NPTL tests
 # Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
 
+ifeq ($(TARGET_ARCH),metag)
+TESTS_DISABLED := tst-cleanup0 tst-cleanupx0
+endif
+
 TESTS := tst-align tst-align2 tst-atfork1 tst-attr1 tst-attr2 tst-attr3	\
 	tst-barrier1 tst-barrier2 tst-barrier3 tst-barrier4 tst-basic1	\
 	tst-basic2 tst-basic3 tst-basic4 tst-basic5 tst-basic6		\
@@ -54,6 +58,7 @@ TESTS += tst-clock tst-clock_nanosleep tst-cpuclock1 tst-cpuclock2	\
 	tst-mqueue7 tst-mqueue8 tst-mqueue9 tst-timer2 tst-timer3	\
 	tst-timer4 tst-timer5
 
+
 ifeq ($(TARGET_ARCH),i386)
 CFLAGS_tst-align := -malign-double -mpreferred-stack-boundary=4
 endif
diff --git a/test/regex/Makefile.in b/test/regex/Makefile.in
index 59d0c06..50badb9 100644
--- a/test/regex/Makefile.in
+++ b/test/regex/Makefile.in
@@ -1,6 +1,6 @@
 # slowsdown embedded test runs extremely and always some
 # some tests are failing
 # for lm32 triggers gcc ICE with gcc 5.3.0
-# ifeq ($(TARGET_lm32),y)
+# ifeq ($(TARGET_ARCH),lm32)
 TESTS_DISABLED := testregex
 # endif
diff --git a/test/time/Makefile.in b/test/time/Makefile.in
index 1c136df..00608f3 100644
--- a/test/time/Makefile.in
+++ b/test/time/Makefile.in
@@ -4,7 +4,7 @@
 TESTS_DISABLED := bug-asctime bug-asctime_r time tst-mktime2 tst-posixtz \
 	tst-strftime tst-strptime tst-timezone
 
-ifeq ($(TARGET_avr32),y)
+ifeq ($(TARGET_ARCH),avr32)
 TESTS_DISABLED += tst-timerfd
 endif
 
diff --git a/test/unistd/Makefile.in b/test/unistd/Makefile.in
index b383388..ee37ced 100644
--- a/test/unistd/Makefile.in
+++ b/test/unistd/Makefile.in
@@ -12,7 +12,7 @@ ifeq ($(UCLIBC_LINUX_SPECIFIC),)
 TESTS_DISABLED += tst-fallocate
 endif
 
-ifeq ($(TARGET_avr32),y)
+ifeq ($(TARGET_ARCH),avr32)
 TESTS_DISABLED += tst-fallocate tst-posix_fallocate tst-fallocate64
 endif