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
This commit is contained in:
Bart Van Assche
2014-12-05 10:49:20 +00:00
parent 4834b768d5
commit bb002671ca
3 changed files with 3 additions and 3 deletions

View File

@@ -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) {

View File

@@ -1,4 +1,4 @@
# Automatically generated by SCST Configurator v3.0.0.
# Automatically generated by SCST Configurator v...
HANDLER vdisk_fileio {

View File

@@ -1,4 +1,4 @@
# Automatically generated by SCST Configurator v3.0.0.
# Automatically generated by SCST Configurator v3.0.0-pre2.
HANDLER vdisk_fileio {