summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornanbor <nanbor@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2003-12-01 05:13:28 +0000
committernanbor <nanbor@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2003-12-01 05:13:28 +0000
commit5f02ad3b25e42625ab6f0fe25ebdabaaba7845b0 (patch)
tree7d971a5966396efcb3ab4f5b5e2e71eb72d3bc37
parentb9e8162944f4e7346d8072df1e3d1383d361dd92 (diff)
downloadATCD-5f02ad3b25e42625ab6f0fe25ebdabaaba7845b0.tar.gz
ChangeLogTag:Sun Nov 30 22:10:26 2003 Nanbor Wang <nanbor@cse.wustl.edu>
-rw-r--r--TAO/CIAO/ChangeLog7
-rwxr-xr-xTAO/CIAO/tests/RTCCM/Priority_Test/descriptors/basic_test.pl19
2 files changed, 20 insertions, 6 deletions
diff --git a/TAO/CIAO/ChangeLog b/TAO/CIAO/ChangeLog
index 4640cf5adb5..ebc3c616de6 100644
--- a/TAO/CIAO/ChangeLog
+++ b/TAO/CIAO/ChangeLog
@@ -1,3 +1,10 @@
+Sun Nov 30 22:10:26 2003 Nanbor Wang <nanbor@cse.wustl.edu>
+
+ * tests/RTCCM/Priority_Test/descriptors/basic_test.pl: Added a new
+ command line switch to prevent invoking client's "stop ()"
+ method. The basic controller runs a fixed number of iterations
+ so it doesn't use stop operation at all.
+
Sun Nov 30 19:20:44 2003 Nanbor Wang <nanbor@cse.wustl.edu>
* docs/RT-Extension.html: Added documentation for RT extension in
diff --git a/TAO/CIAO/tests/RTCCM/Priority_Test/descriptors/basic_test.pl b/TAO/CIAO/tests/RTCCM/Priority_Test/descriptors/basic_test.pl
index 14a803c62c3..0326d814be6 100755
--- a/TAO/CIAO/tests/RTCCM/Priority_Test/descriptors/basic_test.pl
+++ b/TAO/CIAO/tests/RTCCM/Priority_Test/descriptors/basic_test.pl
@@ -40,8 +40,10 @@ unlink $daemon_ior;
unlink $am_ior;
unlink $cookie;
-$test_deploy = 0;
-$no_daemon = 0;
+$test_deploy = 0; # Do not run client/controller at all
+$no_daemon = 0; # Do not start daemon process
+$no_stop = 0; # just invoke the start() operation in
+ # client, no stop() invocation.
# Parse command line argument
while ( $#ARGV >= 0)
@@ -52,6 +54,9 @@ while ( $#ARGV >= 0)
elsif ($ARGV[0] =~ m/^-no_daemon/i) {
$no_daemon = 1;
}
+ elsif ($ARGV[0] =~ m/^-no_stop/i) {
+ $no_stop = 1;
+ }
else {
die "Invalid flag: $ARGV[0]\n";
}
@@ -122,14 +127,16 @@ if ($test_deploy == 0) {
"-k file://$controller_ior -w $work");
$CL->SpawnWaitKill(60);
+ if ($no_stop == 0) {
## Now wait for the test to complete. Need to figure out a way to
## detect this.
- sleep ($run_time);
+ sleep ($run_time);
#Start the client to send the trigger message
- $CL = new PerlACE::Process ("../Controllers/client",
- "-k file://$controller_ior -f");
- $CL->SpawnWaitKill(60);
+ $CL = new PerlACE::Process ("../Controllers/client",
+ "-k file://$controller_ior -f");
+ $CL->SpawnWaitKill(60);
+ }
}
}
else {