From 4f762acebdf753035819d0fd792d786951f896e3 Mon Sep 17 00:00:00 2001
From: Bart Van Assche <bvanassche@acm.org>
Date: Mon, 18 Feb 2019 00:34:03 +0000
Subject: [PATCH] scstadmin: Set remote targets and remote rel_tgt_ids in test
 07

git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@7948 d57e44dd-8a1f-0410-8b47-8ef2f437770f
---
 .../scst-1.0.0/t/07-result.conf               |  8 ++++++++
 .../scst-1.0.0/t/07-scstadmin-args.t          | 19 +++++++++++++------
 2 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/scstadmin/scstadmin.sysfs/scst-1.0.0/t/07-result.conf b/scstadmin/scstadmin.sysfs/scst-1.0.0/t/07-result.conf
index 628162104..01383a020 100644
--- a/scstadmin/scstadmin.sysfs/scst-1.0.0/t/07-result.conf
+++ b/scstadmin/scstadmin.sysfs/scst-1.0.0/t/07-result.conf
@@ -47,6 +47,10 @@ DEVICE_GROUP dgroup1 {
 	TARGET_GROUP tgroup2 {
 		group_id 257
 		state active
+
+		TARGET remote {
+			rel_tgt_id 11
+		}
 	}
 }
 
@@ -61,6 +65,10 @@ DEVICE_GROUP dgroup2 {
 	TARGET_GROUP tgroup2 {
 		group_id 259
 		state active
+
+		TARGET remote {
+			rel_tgt_id 12
+		}
 	}
 }
 
diff --git a/scstadmin/scstadmin.sysfs/scst-1.0.0/t/07-scstadmin-args.t b/scstadmin/scstadmin.sysfs/scst-1.0.0/t/07-scstadmin-args.t
index d252696eb..f0a536cc9 100644
--- a/scstadmin/scstadmin.sysfs/scst-1.0.0/t/07-scstadmin-args.t
+++ b/scstadmin/scstadmin.sysfs/scst-1.0.0/t/07-scstadmin-args.t
@@ -22,7 +22,7 @@ BEGIN {
     unless(grep /blib/, @INC) {
 	unshift(@INC, File::Spec->catdir($scstadmin_pm_dir, "lib"));
     }
-    plan tests => 55;
+    plan tests => 58;
 }
 
 use Data::Dumper;
@@ -68,21 +68,28 @@ sub attributeTest {
 	   "-add_lun 0 -device disk0 $redirect"), 0);
     ok(system("$scstadmin -driver scst_local -target local -group ig " .
 	   "-add_lun 1 -device disk1 $redirect"), 0);
+
     ok(system("$scstadmin -add_dgrp dgroup1 $redirect"), 0);
-    ok(system("$scstadmin -add_dgrp dgroup2 $redirect"), 0);
     ok(system("$scstadmin -add_tgrp tgroup1 -dev_group dgroup1 $redirect"), 0);
     ok(system("$scstadmin -noprompt -set_tgrp_attr tgroup1 -dev_group dgroup1 -attributes group_id=256 $redirect"), 0);
+    ok(system("$scstadmin -add_tgrp_tgt local -dev_group dgroup1 -tgt_group tgroup1 $redirect"), 0);
     ok(system("$scstadmin -add_tgrp tgroup2 -dev_group dgroup1 $redirect"), 0);
     ok(system("$scstadmin -noprompt -set_tgrp_attr tgroup2 -dev_group dgroup1 -attributes group_id=257 $redirect"), 0);
+    ok(system("$scstadmin -add_tgrp_tgt remote -dev_group dgroup1 -tgt_group tgroup2 $redirect"), 0);
+    ok(system("{ echo 11 > /sys/kernel/scst_tgt/device_groups/dgroup1/target_groups/tgroup2/remote/rel_tgt_id; } $redirect"), 0);
+
+    ok(system("$scstadmin -add_dgrp dgroup2 $redirect"), 0);
     ok(system("$scstadmin -add_tgrp tgroup1 -dev_group dgroup2 $redirect"), 0);
     ok(system("$scstadmin -noprompt -set_tgrp_attr tgroup1 -dev_group dgroup2 -attributes group_id=258 $redirect"), 0);
+    ok(system("$scstadmin -add_tgrp_tgt local -dev_group dgroup2 -tgt_group tgroup1 $redirect"), 0);
     ok(system("$scstadmin -add_tgrp tgroup2 -dev_group dgroup2 $redirect"), 0);
     ok(system("$scstadmin -noprompt -set_tgrp_attr tgroup2 -dev_group dgroup2 -attributes group_id=259 $redirect"), 0);
-    ok(system("$scstadmin -add_tgrp_tgt local -dev_group dgroup1 -tgt_group tgroup1 $redirect"), 0);
-    ok(system("$scstadmin -add_tgrp_tgt local -dev_group dgroup2 -tgt_group tgroup1 $redirect"), 0);
-    ok(system("$scstadmin -noprompt -set_tgrp_attr tgroup1 -dev_group dgroup1 -attributes rel_tgt_id=1 $redirect"), 0);
     ok(system("$scstadmin -noprompt -set_tgrp_attr tgroup1 -dev_group dgroup2 -attributes rel_tgt_id=2 $redirect"), 0);
+    ok(system("$scstadmin -add_tgrp_tgt remote -dev_group dgroup2 -tgt_group tgroup2 $redirect"), 0);
+    ok(system("{ echo 12 > /sys/kernel/scst_tgt/device_groups/dgroup2/target_groups/tgroup2/remote/rel_tgt_id; } $redirect"), 0);
+
     ok(system("$scstadmin -write_config $tmpfilename1 >/dev/null"), 0);
+
     # Keep only the scst_local target driver information.
     my $cmd = "gawk 'BEGIN { t = 0 } /^# Automatically generated by SCST Configurator v/ {" .
 	'$0 = "# Automatically generated by SCST Configurator v..." } ' .
@@ -556,7 +563,7 @@ EOS
 
 my $_DEBUG_ = 0;
 if ($_DEBUG_) {
-    $redirect = ">>$redirect_file";
+    $redirect = ">>$redirect_file 2>&1";
     open(my $logfile, '>>', $redirect_file);
     select $logfile;
 } else {