From 890006e411a09c66b2deb45018592f3ed93a22f5 Mon Sep 17 00:00:00 2001 From: Jacob Bachmeyer Date: Tue, 18 Apr 2023 20:42:42 -0500 Subject: [PATCH] Tighten --objdir option test Previously, this test did not ensure that the command-line value for --objdir was in force immediately after loading the local init file. This allowed ::dejagnu::command_line::restore_cmd_vars to do nothing, yet the test would still pass. --- ChangeLog | 6 ++++++ testsuite/runtest.main/options.exp | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 233f8e0..f2ea23a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2023-04-18 Jacob Bachmeyer + + * testsuite/runtest.main/options.exp: Adjust pattern matched in + --objdir test to require the objdir given on the command line to + remain in force immediately after the local init file is loaded. + 2022-12-20 Jacob Bachmeyer * dejagnu.h (totals, TestState::totals): Change "real failed" to diff --git a/testsuite/runtest.main/options.exp b/testsuite/runtest.main/options.exp index 2e2d81c..4784377 100644 --- a/testsuite/runtest.main/options.exp +++ b/testsuite/runtest.main/options.exp @@ -1,4 +1,4 @@ -# Copyright (C) 1992-2016, 2018, 2020 Free Software Foundation, Inc. +# Copyright (C) 1992-2016, 2018, 2020, 2023 Free Software Foundation, Inc. # # This file is part of DejaGnu. # @@ -64,7 +64,7 @@ set tests { "Ignoring test foo.exp" "--ignore option" } { "-v --objdir xXx" - "Using test binaries in xXx" + "Using test binaries in xXx.*Testsuite root is" "--objdir option" } { "-v --tool xXx" "Testing xXx"