From bb002671cac1305e15bb5a5533d64d6b1c8bd470 Mon Sep 17 00:00:00 2001
From: Bart Van Assche <bvanassche@acm.org>
Date: Fri, 5 Dec 2014 10:49:20 +0000
Subject: [PATCH] scstadmin regression tests: Merge r5475:5915 from trunk

git-svn-id: http://svn.code.sf.net/p/scst/svn/branches/3.0.x@5919 d57e44dd-8a1f-0410-8b47-8ef2f437770f
---
 scstadmin/scstadmin.sysfs/scst-0.9.10/t/06-cont-on-err.t    | 2 +-
 scstadmin/scstadmin.sysfs/scst-0.9.10/t/after-restore.conf  | 2 +-
 scstadmin/scstadmin.sysfs/scst-0.9.10/t/to-be-restored.conf | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/scstadmin/scstadmin.sysfs/scst-0.9.10/t/06-cont-on-err.t b/scstadmin/scstadmin.sysfs/scst-0.9.10/t/06-cont-on-err.t
index 2aa100c6a..883f020f3 100644
--- a/scstadmin/scstadmin.sysfs/scst-0.9.10/t/06-cont-on-err.t
+++ b/scstadmin/scstadmin.sysfs/scst-0.9.10/t/06-cont-on-err.t
@@ -46,7 +46,7 @@ sub testRestoreConfig {
     system("$scstadmin -cont_on_err -no_lip -config $to_be_restored" .
 	   " >/dev/null");
     system("$scstadmin -write_config $tmpfilename1 >/dev/null");
-    system("awk 'BEGIN {t = 0 } /^TARGET_DRIVER.*{\$/ { if (\$0 != \"TARGET_DRIVER scst_local {\") t = 1 } /^}\$/ { if (t == 1) t = 2 } /^\$/ { if (t == 2) { t = 3 } } /^./ { if (t == 3) { t = 0 } } { if (t == 0) print }' <$tmpfilename1 >$tmpfilename2");
+    system("awk 'BEGIN {t = 0 } /^# Automatically generated by SCST Configurator v/ { \$0 = \"# Automatically generated by SCST Configurator v...\" } /^TARGET_DRIVER.*{\$/ { if (\$0 != \"TARGET_DRIVER scst_local {\") t = 1 } /^}\$/ { if (t == 1) t = 2 } /^\$/ { if (t == 2) { t = 3 } } /^./ { if (t == 3) { t = 0 } } { if (t == 0) print }' <$tmpfilename1 >$tmpfilename2");
     my $compare_result = system("diff -u $tmpfilename2 $expected");
     ok($compare_result, 0);
     if ($compare_result == 0) {
diff --git a/scstadmin/scstadmin.sysfs/scst-0.9.10/t/after-restore.conf b/scstadmin/scstadmin.sysfs/scst-0.9.10/t/after-restore.conf
index a6ee39010..da8c75c37 100644
--- a/scstadmin/scstadmin.sysfs/scst-0.9.10/t/after-restore.conf
+++ b/scstadmin/scstadmin.sysfs/scst-0.9.10/t/after-restore.conf
@@ -1,4 +1,4 @@
-# Automatically generated by SCST Configurator v3.0.0.
+# Automatically generated by SCST Configurator v...
 
 
 HANDLER vdisk_fileio {
diff --git a/scstadmin/scstadmin.sysfs/scst-0.9.10/t/to-be-restored.conf b/scstadmin/scstadmin.sysfs/scst-0.9.10/t/to-be-restored.conf
index 7d9229b6c..b4988b721 100644
--- a/scstadmin/scstadmin.sysfs/scst-0.9.10/t/to-be-restored.conf
+++ b/scstadmin/scstadmin.sysfs/scst-0.9.10/t/to-be-restored.conf
@@ -1,4 +1,4 @@
-# Automatically generated by SCST Configurator v3.0.0.
+# Automatically generated by SCST Configurator v3.0.0-pre2.
 
 
 HANDLER vdisk_fileio {