diff options
| -rw-r--r-- | gdb/testsuite/gdb.arch/arm-pthread_cond_timedwait-bt.exp | 11 | ||||
| -rw-r--r-- | gdb/testsuite/gdb.base/readnever.exp | 11 |
2 files changed, 8 insertions, 14 deletions
diff --git a/gdb/testsuite/gdb.arch/arm-pthread_cond_timedwait-bt.exp b/gdb/testsuite/gdb.arch/arm-pthread_cond_timedwait-bt.exp index 0cf7f27..17f8d68 100644 --- a/gdb/testsuite/gdb.arch/arm-pthread_cond_timedwait-bt.exp +++ b/gdb/testsuite/gdb.arch/arm-pthread_cond_timedwait-bt.exp @@ -17,6 +17,10 @@ # syscall is active. But some active syscalls keep PC pointing to the SVC # instruction itself. +# See if we have target board readnow.exp or similar. We're using +# --readnever, which is not allowed in combination with --readnow. +require !readnow + standard_testfile if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile} \ @@ -24,13 +28,6 @@ if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile} \ return } -# See if we have target board readnow.exp or similar. -if { [lsearch -exact $GDBFLAGS -readnow] != -1 \ - || [lsearch -exact $GDBFLAGS --readnow] != -1 } { - untested "--readnever not allowed in combination with --readnow" - return -1 -} - save_vars { GDBFLAGS } { append GDBFLAGS " --readnever" if { [clean_restart ${binfile}] == -1 } { diff --git a/gdb/testsuite/gdb.base/readnever.exp b/gdb/testsuite/gdb.base/readnever.exp index 765b5bd..8a21c41 100644 --- a/gdb/testsuite/gdb.base/readnever.exp +++ b/gdb/testsuite/gdb.base/readnever.exp @@ -13,6 +13,10 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. +# See if we have target board readnow.exp or similar. We're using +# --readnever, which is not allowed in combination with --readnow. +require !readnow + standard_testfile .c if { [build_executable "failed to build" $testfile $srcfile { debug }] == -1 } { @@ -20,13 +24,6 @@ if { [build_executable "failed to build" $testfile $srcfile { debug }] == -1 } { return -1 } -# See if we have target board readnow.exp or similar. -if { [lsearch -exact $GDBFLAGS -readnow] != -1 \ - || [lsearch -exact $GDBFLAGS --readnow] != -1 } { - untested "--readnever not allowed in combination with --readnow" - return -1 -} - save_vars { GDBFLAGS } { append GDBFLAGS " --readnever" if { [clean_restart ${binfile}] == -1 } { |