Backing out patch 1 and 2 from Bugzilla 349790.

The new script (tests/check_ppc64_auxv_cap) in the first patch was
written for the bash shell.  I was told by fkrohm that there was an
issue with bash sometime ago and the decision was to use sh instead.
sh maps to bash on a lot of systems but on some it maps to dash.  The
script is not compatible with dash.

In retesting the second patch with a fresh svn pull, I found that I
forgot to do the svn add for the new script file.  Which causes the
regression test to fail with the second patch applied.

So, I have decided it will be best to just back out patch 1 and 2 for now.
I will fix the script and do this again.

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

diff --git a/memcheck/tests/ppc32/power_ISA2_07.vgtest b/memcheck/tests/ppc32/power_ISA2_07.vgtest
index 4100df3167a96bcd0ad1b679ac26e3bed913474b..9a43785037b7ae3c102035a244bd472fa91ba996 100644 (file)
--- a/memcheck/tests/ppc32/power_ISA2_07.vgtest
+++ b/memcheck/tests/ppc32/power_ISA2_07.vgtest
@@ -1,3 +1,3 @@
-prereq: ../../../tests/check_ppc64_auxv_cap arch_2_07
+prereq: ../../../tests/check_isa-2_07_cap
 prog: power_ISA2_07
 vgopts: 

diff --git a/memcheck/tests/ppc64/power_ISA2_07.vgtest b/memcheck/tests/ppc64/power_ISA2_07.vgtest
index fa34a1e1536021484e0a4faffdbc6068b127111c..63ba88f5dab80018f6d37508d145cd2c0cff3868 100644 (file)
--- a/memcheck/tests/ppc64/power_ISA2_07.vgtest
+++ b/memcheck/tests/ppc64/power_ISA2_07.vgtest
@@ -1,3 +1,3 @@
-prereq: ../../../tests/check_ppc64_auxv_cap arch_2_07
+prereq: ../../../tests/check_isa-2_07_cap
 prog: power_ISA2_07
 vgopts:

diff --git a/none/tests/ppc32/bug129390-ppc32.vgtest b/none/tests/ppc32/bug129390-ppc32.vgtest
index 13165fc5fd4813818ca665b0f159aa8e68a22eb1..d7d05b3c767c2a2d651c644c12d41009f9a08457 100644 (file)
--- a/none/tests/ppc32/bug129390-ppc32.vgtest
+++ b/none/tests/ppc32/bug129390-ppc32.vgtest
@@ -1,3 +1,3 @@
-prereq: ../../../tests/check_ppc64_auxv_cap altivec
+prereq: ../../../tests/check_vmx_cap
 prog: bug129390-ppc32
 vgopts: -q

diff --git a/none/tests/ppc32/jm-vmx.vgtest b/none/tests/ppc32/jm-vmx.vgtest
index d29d397e147dea5011950368a7dbd75c5316fc72..183536b56208ef67b420af78ae080ed6e3ca590c 100644 (file)
--- a/none/tests/ppc32/jm-vmx.vgtest
+++ b/none/tests/ppc32/jm-vmx.vgtest
@@ -1,2 +1,2 @@
-prereq: ../../../tests/check_ppc64_auxv_cap altivec
+prereq: ../../../tests/check_vmx_cap
 prog: jm-insns -a

diff --git a/none/tests/ppc32/jm_fp_isa_2_07.vgtest b/none/tests/ppc32/jm_fp_isa_2_07.vgtest
index dd846e0d054e9267b532adc29a9af7c847628bf6..a61616cf76b64066a4bb8c18e86472a6bb48b4e7 100644 (file)
--- a/none/tests/ppc32/jm_fp_isa_2_07.vgtest
+++ b/none/tests/ppc32/jm_fp_isa_2_07.vgtest
@@ -1,2 +1,2 @@
-prereq: ../../../tests/check_ppc64_auxv_cap arch_2_07
+prereq: ../../../tests/check_isa-2_07_cap
 prog: test_isa_2_07_part1 -f

diff --git a/none/tests/ppc32/jm_int_isa_2_07.vgtest b/none/tests/ppc32/jm_int_isa_2_07.vgtest
index 0bf9d8bab014218953a71fc7e9aa16301173b0e9..f1f6c481e9d41807438a0364080f9b3ff1975dac 100644 (file)
--- a/none/tests/ppc32/jm_int_isa_2_07.vgtest
+++ b/none/tests/ppc32/jm_int_isa_2_07.vgtest
@@ -1,2 +1,2 @@
-prereq: ../../../tests/check_ppc64_auxv_cap arch_2_07
+prereq: ../../../tests/check_isa-2_07_cap
 prog: test_isa_2_07_part1 -i

diff --git a/none/tests/ppc32/jm_vec_isa_2_07.vgtest b/none/tests/ppc32/jm_vec_isa_2_07.vgtest
index 1d95f27660fcecc9340bd49ad13f59d140142c06..f69c126e64d6f432a005a1e207ab3e1b2c766106 100644 (file)
--- a/none/tests/ppc32/jm_vec_isa_2_07.vgtest
+++ b/none/tests/ppc32/jm_vec_isa_2_07.vgtest
@@ -1,2 +1,2 @@
-prereq: ../../../tests/check_ppc64_auxv_cap arch_2_07 && ! ../../../tests/check_ppc64le_cap
+prereq: ../../../tests/check_isa-2_07_cap && ! ../../../tests/check_ppc64le_cap
 prog: test_isa_2_07_part1 -a

diff --git a/none/tests/ppc32/testVMX.vgtest b/none/tests/ppc32/testVMX.vgtest
index b36dbcba6ae26ab9a2db38e4eeaedad76c00bcb4..81c59f20126465296b2aae7ae3bee5ade2eae53f 100644 (file)
--- a/none/tests/ppc32/testVMX.vgtest
+++ b/none/tests/ppc32/testVMX.vgtest
@@ -1,2 +1,2 @@
-prereq: ../../../tests/check_ppc64_auxv_cap altivec
+prereq: ../../../tests/check_vmx_cap
 prog: testVMX

diff --git a/none/tests/ppc32/test_dfp1.vgtest b/none/tests/ppc32/test_dfp1.vgtest
index 71af5fa64055ae8c6cf306e3b40b9ae3b1c48689..0efe5dfd1d32b7fcd2aad7b0d4db2f76712ea71c 100644 (file)
--- a/none/tests/ppc32/test_dfp1.vgtest
+++ b/none/tests/ppc32/test_dfp1.vgtest
@@ -1,2 +1,2 @@
-prereq: ../../../tests/check_ppc64_auxv_cap dfp
+prereq: ../../../tests/check_dfp_cap
 prog: test_dfp1

diff --git a/none/tests/ppc32/test_dfp2.vgtest b/none/tests/ppc32/test_dfp2.vgtest
index 23a1f00ede63dc7aebba4adf07cb92097d40cee0..7fe6c16f0a4fb51ef5f93e8ff0b6335208676ecc 100644 (file)
--- a/none/tests/ppc32/test_dfp2.vgtest
+++ b/none/tests/ppc32/test_dfp2.vgtest
@@ -1,2 +1,2 @@
-prereq: ../../../tests/check_ppc64_auxv_cap dfp
+prereq: ../../../tests/check_dfp_cap
 prog: test_dfp2

diff --git a/none/tests/ppc32/test_dfp3.vgtest b/none/tests/ppc32/test_dfp3.vgtest
index e806e85e21574c3b3871d24e746d662277463fd8..39168a36a7e9946753fc046d0b85d5faa73a5904 100644 (file)
--- a/none/tests/ppc32/test_dfp3.vgtest
+++ b/none/tests/ppc32/test_dfp3.vgtest
@@ -1,2 +1,2 @@
-prereq: ../../../tests/check_ppc64_auxv_cap dfp
+prereq: ../../../tests/check_dfp_cap
 prog: test_dfp3

diff --git a/none/tests/ppc32/test_dfp4.vgtest b/none/tests/ppc32/test_dfp4.vgtest
index 7688eb8ac96bf5b2c2ff16344e3f381752903aed..dac33568bfe2acf7530d038193c869b6b66b2766 100644 (file)
--- a/none/tests/ppc32/test_dfp4.vgtest
+++ b/none/tests/ppc32/test_dfp4.vgtest
@@ -1,2 +1,2 @@
-prereq: ../../../tests/check_ppc64_auxv_cap dfp
+prereq: ../../../tests/check_dfp_cap
 prog: test_dfp4

diff --git a/none/tests/ppc32/test_dfp5.vgtest b/none/tests/ppc32/test_dfp5.vgtest
index 0c905d8d9e62727932d5585e39fde8fccc9091e5..9777d05117de08450c29b47937214c5a62c286e2 100644 (file)
--- a/none/tests/ppc32/test_dfp5.vgtest
+++ b/none/tests/ppc32/test_dfp5.vgtest
@@ -1,2 +1,2 @@
-prereq: ../../../tests/check_ppc64_auxv_cap dfp
+prereq: ../../../tests/check_dfp_cap
 prog: test_dfp5

diff --git a/none/tests/ppc32/test_isa_2_06_part1.vgtest b/none/tests/ppc32/test_isa_2_06_part1.vgtest
index 29e9d06459bd5c9aaccd93ac0b406b2387e09711..512a2181248e6466ef0ab2d9cf0346b916b33548 100644 (file)
--- a/none/tests/ppc32/test_isa_2_06_part1.vgtest
+++ b/none/tests/ppc32/test_isa_2_06_part1.vgtest
@@ -1,2 +1,2 @@
-prereq: ../../../tests/check_ppc64_auxv_cap arch_2_06
+prereq: ../../../tests/check_isa-2_06_cap
 prog: test_isa_2_06_part1

diff --git a/none/tests/ppc32/test_isa_2_06_part2.vgtest b/none/tests/ppc32/test_isa_2_06_part2.vgtest
index 7783c5e43f84f4919d105647f4149ce00ef78cc4..7ae01beb87ce84387706f318b1b396a04e0dc18f 100644 (file)
--- a/none/tests/ppc32/test_isa_2_06_part2.vgtest
+++ b/none/tests/ppc32/test_isa_2_06_part2.vgtest
@@ -1,2 +1,2 @@
-prereq: ../../../tests/check_ppc64_auxv_cap arch_2_06
+prereq: ../../../tests/check_isa-2_06_cap
 prog: test_isa_2_06_part2

diff --git a/none/tests/ppc32/test_isa_2_06_part3.vgtest b/none/tests/ppc32/test_isa_2_06_part3.vgtest
index e4ccfeeab257da51d24e76fc2459146b18a3a6fe..3519c8a055495ccc21636c6ab7c1a66342a7f3f4 100644 (file)
--- a/none/tests/ppc32/test_isa_2_06_part3.vgtest
+++ b/none/tests/ppc32/test_isa_2_06_part3.vgtest
@@ -1,2 +1,2 @@
-prereq: ../../../tests/check_ppc64_auxv_cap arch_2_06
+prereq: ../../../tests/check_isa-2_06_cap
 prog: test_isa_2_06_part3

diff --git a/none/tests/ppc32/test_isa_2_07_part2.vgtest b/none/tests/ppc32/test_isa_2_07_part2.vgtest
index 8108796a9ac51f30ceff0b770d257884f60085bf..a4649be9f40609e308829c6e6c27503a74dd6d13 100644 (file)
--- a/none/tests/ppc32/test_isa_2_07_part2.vgtest
+++ b/none/tests/ppc32/test_isa_2_07_part2.vgtest
@@ -1,2 +1,2 @@
-prereq: ../../../tests/check_ppc64_auxv_cap arch_2_07
+prereq: ../../../tests/check_isa-2_07_cap
 prog: test_isa_2_07_part2

diff --git a/none/tests/ppc32/test_tm.vgtest b/none/tests/ppc32/test_tm.vgtest
index f258077153006c7d28155b7868ba41fb0f62bc27..977c326a52c023565436a4d0d5c4208532bea75e 100644 (file)
--- a/none/tests/ppc32/test_tm.vgtest
+++ b/none/tests/ppc32/test_tm.vgtest
@@ -1,2 +1,2 @@
-prereq: ../../../tests/check_ppc64_auxv_cap htm
+prereq: ../../../tests/check_isa-2_07_cap
 prog: test_tm

diff --git a/none/tests/ppc32/test_touch_tm.vgtest b/none/tests/ppc32/test_touch_tm.vgtest
index 50409b7c2f2456c6a6298d7ed1247686bf3bdd22..4806ccfae5f61637879816198b648e3ba3af17ba 100644 (file)
--- a/none/tests/ppc32/test_touch_tm.vgtest
+++ b/none/tests/ppc32/test_touch_tm.vgtest
@@ -1,2 +1,2 @@
-prereq: ../../../tests/check_ppc64_auxv_cap htm
+prereq: ../../../tests/check_isa-2_07_cap
 prog: test_touch_tm

diff --git a/none/tests/ppc64/jm-vmx.vgtest b/none/tests/ppc64/jm-vmx.vgtest
index d29d397e147dea5011950368a7dbd75c5316fc72..183536b56208ef67b420af78ae080ed6e3ca590c 100644 (file)
--- a/none/tests/ppc64/jm-vmx.vgtest
+++ b/none/tests/ppc64/jm-vmx.vgtest
@@ -1,2 +1,2 @@
-prereq: ../../../tests/check_ppc64_auxv_cap altivec
+prereq: ../../../tests/check_vmx_cap
 prog: jm-insns -a

diff --git a/none/tests/ppc64/jm_fp_isa_2_07.vgtest b/none/tests/ppc64/jm_fp_isa_2_07.vgtest
index dd846e0d054e9267b532adc29a9af7c847628bf6..a61616cf76b64066a4bb8c18e86472a6bb48b4e7 100644 (file)
--- a/none/tests/ppc64/jm_fp_isa_2_07.vgtest
+++ b/none/tests/ppc64/jm_fp_isa_2_07.vgtest
@@ -1,2 +1,2 @@
-prereq: ../../../tests/check_ppc64_auxv_cap arch_2_07
+prereq: ../../../tests/check_isa-2_07_cap
 prog: test_isa_2_07_part1 -f

diff --git a/none/tests/ppc64/jm_int_isa_2_07.vgtest b/none/tests/ppc64/jm_int_isa_2_07.vgtest
index 0bf9d8bab014218953a71fc7e9aa16301173b0e9..f1f6c481e9d41807438a0364080f9b3ff1975dac 100644 (file)
--- a/none/tests/ppc64/jm_int_isa_2_07.vgtest
+++ b/none/tests/ppc64/jm_int_isa_2_07.vgtest
@@ -1,2 +1,2 @@
-prereq: ../../../tests/check_ppc64_auxv_cap arch_2_07
+prereq: ../../../tests/check_isa-2_07_cap
 prog: test_isa_2_07_part1 -i

diff --git a/none/tests/ppc64/jm_vec_isa_2_07.vgtest b/none/tests/ppc64/jm_vec_isa_2_07.vgtest
index dc9522013c8601f9197575a52c82053805d2dca6..a93060a0b97a395c55b519a24a8373c157f58fae 100644 (file)
--- a/none/tests/ppc64/jm_vec_isa_2_07.vgtest
+++ b/none/tests/ppc64/jm_vec_isa_2_07.vgtest
@@ -1,2 +1,2 @@
-prereq: ../../../tests/check_ppc64_auxv_cap arch_2_07
+prereq: ../../../tests/check_isa-2_07_cap
 prog: test_isa_2_07_part1 -a

diff --git a/none/tests/ppc64/test_dfp1.vgtest b/none/tests/ppc64/test_dfp1.vgtest
index 71af5fa64055ae8c6cf306e3b40b9ae3b1c48689..0efe5dfd1d32b7fcd2aad7b0d4db2f76712ea71c 100644 (file)
--- a/none/tests/ppc64/test_dfp1.vgtest
+++ b/none/tests/ppc64/test_dfp1.vgtest
@@ -1,2 +1,2 @@
-prereq: ../../../tests/check_ppc64_auxv_cap dfp
+prereq: ../../../tests/check_dfp_cap
 prog: test_dfp1

diff --git a/none/tests/ppc64/test_dfp2.vgtest b/none/tests/ppc64/test_dfp2.vgtest
index 23a1f00ede63dc7aebba4adf07cb92097d40cee0..7fe6c16f0a4fb51ef5f93e8ff0b6335208676ecc 100644 (file)
--- a/none/tests/ppc64/test_dfp2.vgtest
+++ b/none/tests/ppc64/test_dfp2.vgtest
@@ -1,2 +1,2 @@
-prereq: ../../../tests/check_ppc64_auxv_cap dfp
+prereq: ../../../tests/check_dfp_cap
 prog: test_dfp2

diff --git a/none/tests/ppc64/test_dfp3.vgtest b/none/tests/ppc64/test_dfp3.vgtest
index e806e85e21574c3b3871d24e746d662277463fd8..39168a36a7e9946753fc046d0b85d5faa73a5904 100644 (file)
--- a/none/tests/ppc64/test_dfp3.vgtest
+++ b/none/tests/ppc64/test_dfp3.vgtest
@@ -1,2 +1,2 @@
-prereq: ../../../tests/check_ppc64_auxv_cap dfp
+prereq: ../../../tests/check_dfp_cap
 prog: test_dfp3

diff --git a/none/tests/ppc64/test_dfp4.vgtest b/none/tests/ppc64/test_dfp4.vgtest
index 7688eb8ac96bf5b2c2ff16344e3f381752903aed..dac33568bfe2acf7530d038193c869b6b66b2766 100644 (file)
--- a/none/tests/ppc64/test_dfp4.vgtest
+++ b/none/tests/ppc64/test_dfp4.vgtest
@@ -1,2 +1,2 @@
-prereq: ../../../tests/check_ppc64_auxv_cap dfp
+prereq: ../../../tests/check_dfp_cap
 prog: test_dfp4

diff --git a/none/tests/ppc64/test_dfp5.vgtest b/none/tests/ppc64/test_dfp5.vgtest
index 0c905d8d9e62727932d5585e39fde8fccc9091e5..9777d05117de08450c29b47937214c5a62c286e2 100644 (file)
--- a/none/tests/ppc64/test_dfp5.vgtest
+++ b/none/tests/ppc64/test_dfp5.vgtest
@@ -1,2 +1,2 @@
-prereq: ../../../tests/check_ppc64_auxv_cap dfp
+prereq: ../../../tests/check_dfp_cap
 prog: test_dfp5

diff --git a/none/tests/ppc64/test_isa_2_06_part1.vgtest b/none/tests/ppc64/test_isa_2_06_part1.vgtest
index 29e9d06459bd5c9aaccd93ac0b406b2387e09711..512a2181248e6466ef0ab2d9cf0346b916b33548 100644 (file)
--- a/none/tests/ppc64/test_isa_2_06_part1.vgtest
+++ b/none/tests/ppc64/test_isa_2_06_part1.vgtest
@@ -1,2 +1,2 @@
-prereq: ../../../tests/check_ppc64_auxv_cap arch_2_06
+prereq: ../../../tests/check_isa-2_06_cap
 prog: test_isa_2_06_part1

diff --git a/none/tests/ppc64/test_isa_2_06_part2.vgtest b/none/tests/ppc64/test_isa_2_06_part2.vgtest
index 7783c5e43f84f4919d105647f4149ce00ef78cc4..7ae01beb87ce84387706f318b1b396a04e0dc18f 100644 (file)
--- a/none/tests/ppc64/test_isa_2_06_part2.vgtest
+++ b/none/tests/ppc64/test_isa_2_06_part2.vgtest
@@ -1,2 +1,2 @@
-prereq: ../../../tests/check_ppc64_auxv_cap arch_2_06
+prereq: ../../../tests/check_isa-2_06_cap
 prog: test_isa_2_06_part2

diff --git a/none/tests/ppc64/test_isa_2_06_part3.vgtest b/none/tests/ppc64/test_isa_2_06_part3.vgtest
index e4ccfeeab257da51d24e76fc2459146b18a3a6fe..3519c8a055495ccc21636c6ab7c1a66342a7f3f4 100644 (file)
--- a/none/tests/ppc64/test_isa_2_06_part3.vgtest
+++ b/none/tests/ppc64/test_isa_2_06_part3.vgtest
@@ -1,2 +1,2 @@
-prereq: ../../../tests/check_ppc64_auxv_cap arch_2_06
+prereq: ../../../tests/check_isa-2_06_cap
 prog: test_isa_2_06_part3

diff --git a/none/tests/ppc64/test_isa_2_07_part2.vgtest b/none/tests/ppc64/test_isa_2_07_part2.vgtest
index 8108796a9ac51f30ceff0b770d257884f60085bf..a4649be9f40609e308829c6e6c27503a74dd6d13 100644 (file)
--- a/none/tests/ppc64/test_isa_2_07_part2.vgtest
+++ b/none/tests/ppc64/test_isa_2_07_part2.vgtest
@@ -1,2 +1,2 @@
-prereq: ../../../tests/check_ppc64_auxv_cap arch_2_07
+prereq: ../../../tests/check_isa-2_07_cap
 prog: test_isa_2_07_part2

diff --git a/none/tests/ppc64/test_tm.vgtest b/none/tests/ppc64/test_tm.vgtest
index f258077153006c7d28155b7868ba41fb0f62bc27..977c326a52c023565436a4d0d5c4208532bea75e 100644 (file)
--- a/none/tests/ppc64/test_tm.vgtest
+++ b/none/tests/ppc64/test_tm.vgtest
@@ -1,2 +1,2 @@
-prereq: ../../../tests/check_ppc64_auxv_cap htm
+prereq: ../../../tests/check_isa-2_07_cap
 prog: test_tm

diff --git a/none/tests/ppc64/test_touch_tm.vgtest b/none/tests/ppc64/test_touch_tm.vgtest
index 50409b7c2f2456c6a6298d7ed1247686bf3bdd22..4806ccfae5f61637879816198b648e3ba3af17ba 100644 (file)
--- a/none/tests/ppc64/test_touch_tm.vgtest
+++ b/none/tests/ppc64/test_touch_tm.vgtest
@@ -1,2 +1,2 @@
-prereq: ../../../tests/check_ppc64_auxv_cap htm
+prereq: ../../../tests/check_isa-2_07_cap
 prog: test_touch_tm

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 07f3d6463883e13503c04d2d1139e0827a58f8cc..b01cfb7f502e85d2756d2f8089497735fc030eaa 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -8,7 +8,6 @@ dist_noinst_SCRIPTS = \
        check_makefile_consistency \
        check_dfp_cap \
        check_vmx_cap \
-       check_ppc64_auxv_cap \
        filter_addresses \
        filter_discards \
        filter_libc \