mips64: run FPU tests only when FPU is available

Check whether the target platform is meant to have an FPU before executing
tests that make use of a floating-point unit.

git-svn-id: svn://svn.valgrind.org/valgrind/trunk@14571

diff --git a/none/tests/mips64/fpu_arithmetic.vgtest b/none/tests/mips64/fpu_arithmetic.vgtest
index 0f1578344fb8390632638c60ff551d5e623dc807..7efa55556853dc14bad27216a2d004044ef2d02e 100644 (file)
--- a/none/tests/mips64/fpu_arithmetic.vgtest
+++ b/none/tests/mips64/fpu_arithmetic.vgtest
@@ -1,2 +1,3 @@
 prog: fpu_arithmetic
+prereq: ../../../tests/mips_features fpu
 vgopts: -q

diff --git a/none/tests/mips64/fpu_branches.vgtest b/none/tests/mips64/fpu_branches.vgtest
index 206651219753ab2d53325f2182340822854754a9..1854b59cf5caf330c3fffd12d1caaaca8e66cacd 100644 (file)
--- a/none/tests/mips64/fpu_branches.vgtest
+++ b/none/tests/mips64/fpu_branches.vgtest
@@ -1,2 +1,3 @@
 prog: fpu_branches
+prereq: ../../../tests/mips_features fpu
 vgopts: -q

diff --git a/none/tests/mips64/fpu_control_word.vgtest b/none/tests/mips64/fpu_control_word.vgtest
index 060906c784967566803bd33ad6160d37f18f724b..619256e3b7057f68bb2985577b445cdf08c072ea 100644 (file)
--- a/none/tests/mips64/fpu_control_word.vgtest
+++ b/none/tests/mips64/fpu_control_word.vgtest
@@ -1,2 +1,3 @@
 prog: fpu_control_word
+prereq: ../../../tests/mips_features fpu
 vgopts: -q

diff --git a/none/tests/mips64/fpu_load_store.vgtest b/none/tests/mips64/fpu_load_store.vgtest
index e817184bae194339fe339a1b2ff1f26cbbde5eac..d6d3f7dd4900cef9d7c5150d9ecab6e659ca9dd6 100644 (file)
--- a/none/tests/mips64/fpu_load_store.vgtest
+++ b/none/tests/mips64/fpu_load_store.vgtest
@@ -1,2 +1,3 @@
 prog: fpu_load_store
+prereq: ../../../tests/mips_features fpu
 vgopts: -q

diff --git a/none/tests/mips64/load_store_unaligned.vgtest b/none/tests/mips64/load_store_unaligned.vgtest
index e5e836c565dae9fc2f7a29f830665bf27717644b..f25ccc99066091b6d917016a758dbe6da89882b9 100644 (file)
--- a/none/tests/mips64/load_store_unaligned.vgtest
+++ b/none/tests/mips64/load_store_unaligned.vgtest
@@ -1,2 +1,3 @@
 prog: load_store_unaligned
+prereq: ../../../tests/mips_features fpu
 vgopts: -q

diff --git a/none/tests/mips64/move_instructions.vgtest b/none/tests/mips64/move_instructions.vgtest
index c6cc57bdefd32a221c5062a06b596d878c0a1c19..19d020efecf662eb226da1aeb4ee5fe5a39dea72 100644 (file)
--- a/none/tests/mips64/move_instructions.vgtest
+++ b/none/tests/mips64/move_instructions.vgtest
@@ -1,2 +1,3 @@
 prog: move_instructions
+prereq: ../../../tests/mips_features fpu
 vgopts: -q

diff --git a/none/tests/mips64/round.vgtest b/none/tests/mips64/round.vgtest
index d5eb00e8f048f1a5f646198064dbd786d730e848..a0374b4bf87e1ab2714b1eb72c0dfffe51fa45a1 100644 (file)
--- a/none/tests/mips64/round.vgtest
+++ b/none/tests/mips64/round.vgtest
@@ -1,2 +1,3 @@
 prog: round
+prereq: ../../../tests/mips_features fpu
 vgopts: -q

diff --git a/none/tests/mips64/test_fcsr.vgtest b/none/tests/mips64/test_fcsr.vgtest
index c864d253f01cb148f74f4accb24390790a205655..69dba5b377947c89dc7705260cb15598963c7862 100644 (file)
--- a/none/tests/mips64/test_fcsr.vgtest
+++ b/none/tests/mips64/test_fcsr.vgtest
@@ -1,2 +1,3 @@
 prog: test_fcsr
+prereq: ../../../tests/mips_features fpu
 vgopts: -q

diff --git a/tests/mips_features.c b/tests/mips_features.c
index d0e01e5fdcba5757794330ad33b53b85775f1212..5edb1207d574c00fbb4f9cb33f985868df8a09b6 100644 (file)
--- a/tests/mips_features.c
+++ b/tests/mips_features.c
@@ -47,7 +47,7 @@ static int mipsCPUInfo(const char *search_string) {
 static int go(char *feature)
 {
    int cpuinfo;
-   if (strcmp(feature, "hard-float") == 0) {
+   if (strcmp(feature, "fpu") == 0) {
 #if defined(__mips_hard_float)
       /* This is not a runtime detection.
          If mips_features is built as hard-float, the assumption is that