From b56d94a1538a2b04c5eb6d92a1c80a1e20b79c29 Mon Sep 17 00:00:00 2001 From: Bart Van Assche Date: Sat, 16 Feb 2019 18:32:42 +0000 Subject: [PATCH] scstadmin: Make it easier to debug regression test 06 git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@7935 d57e44dd-8a1f-0410-8b47-8ef2f437770f --- .../scstadmin.sysfs/scst-1.0.0/t/06-cont-on-err.t | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/scstadmin/scstadmin.sysfs/scst-1.0.0/t/06-cont-on-err.t b/scstadmin/scstadmin.sysfs/scst-1.0.0/t/06-cont-on-err.t index 713fb982c..8027c5a68 100644 --- a/scstadmin/scstadmin.sysfs/scst-1.0.0/t/06-cont-on-err.t +++ b/scstadmin/scstadmin.sysfs/scst-1.0.0/t/06-cont-on-err.t @@ -11,8 +11,12 @@ my $testdir; my $scstadmin_pm_dir; my $scstadmin_dir; my $scstadmin; +my $redirect_file; +my $redirect; BEGIN { + $redirect_file = "/tmp/scstadmin-test-06-output.txt"; + unlink($redirect_file); $testdir = dirname(abs_path($0)); $scstadmin_pm_dir = dirname($testdir); $scstadmin_dir = dirname($scstadmin_pm_dir); @@ -45,7 +49,7 @@ sub testRestoreConfig { my $diff = File::Spec->catfile(File::Spec->tmpdir(), "scstadmin-test-06-$$-diff"); - ok(system("$scstadmin -clear_config -force -noprompt -no_lip >/dev/null"), 0); + ok(system("$scstadmin -clear_config -force -noprompt -no_lip $redirect"), 0); system("$scstadmin -cont_on_err -no_lip -config $to_be_restored" . " >/dev/null"); ok(system("$scstadmin -write_config $tmpfilename1 >/dev/null"), 0); @@ -66,6 +70,13 @@ sub testRestoreConfig { } my $_DEBUG_ = 0; +if ($_DEBUG_) { + $redirect = ">>$redirect_file"; + open(my $logfile, '>>', $redirect_file); + select $logfile; +} else { + $redirect = ">/dev/null"; +} my $SCST = eval { new SCST::SCST($_DEBUG_) }; die("Creation of SCST object failed") if (!defined($SCST));