From: Carl Love Date: Wed, 1 Jul 2015 21:29:12 +0000 (+0000) Subject: Backing out patch 1 and 2 from Bugzilla 349790. X-Git-Tag: svn/VALGRIND_3_11_0~254 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c4fb707788a92dcb8c02c6fca1edfe834b069a1f;p=thirdparty%2Fvalgrind.git 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 4100df3167..9a43785037 100644 --- 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 fa34a1e153..63ba88f5da 100644 --- 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 13165fc5fd..d7d05b3c76 100644 --- 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 d29d397e14..183536b562 100644 --- 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 dd846e0d05..a61616cf76 100644 --- 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 0bf9d8bab0..f1f6c481e9 100644 --- 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 1d95f27660..f69c126e64 100644 --- 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 b36dbcba6a..81c59f2012 100644 --- 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 71af5fa640..0efe5dfd1d 100644 --- 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 23a1f00ede..7fe6c16f0a 100644 --- 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 e806e85e21..39168a36a7 100644 --- 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 7688eb8ac9..dac33568bf 100644 --- 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 0c905d8d9e..9777d05117 100644 --- 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 29e9d06459..512a218124 100644 --- 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 7783c5e43f..7ae01beb87 100644 --- 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 e4ccfeeab2..3519c8a055 100644 --- 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 8108796a9a..a4649be9f4 100644 --- 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 f258077153..977c326a52 100644 --- 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 50409b7c2f..4806ccfae5 100644 --- 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 d29d397e14..183536b562 100644 --- 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 dd846e0d05..a61616cf76 100644 --- 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 0bf9d8bab0..f1f6c481e9 100644 --- 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 dc9522013c..a93060a0b9 100644 --- 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 71af5fa640..0efe5dfd1d 100644 --- 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 23a1f00ede..7fe6c16f0a 100644 --- 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 e806e85e21..39168a36a7 100644 --- 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 7688eb8ac9..dac33568bf 100644 --- 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 0c905d8d9e..9777d05117 100644 --- 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 29e9d06459..512a218124 100644 --- 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 7783c5e43f..7ae01beb87 100644 --- 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 e4ccfeeab2..3519c8a055 100644 --- 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 8108796a9a..a4649be9f4 100644 --- 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 f258077153..977c326a52 100644 --- 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 50409b7c2f..4806ccfae5 100644 --- 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 07f3d64638..b01cfb7f50 100644 --- 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 \