1 files changed, 49 insertions, 39 deletions
diff --git a/TAO/orbsvcs/tests/Event/Basic/exhaustive_test.pl b/TAO/orbsvcs/tests/Event/Basic/exhaustive_test.pl
index 8ac6b2e0dc1..6811dd7c615 100755
--- a/TAO/orbsvcs/tests/Event/Basic/exhaustive_test.pl
+++ b/TAO/orbsvcs/tests/Event/Basic/exhaustive_test.pl
@@ -8,51 +8,61 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
 # This is a Perl script that runs the client and all the other servers that
 # are needed
 
-use lib '../../../../../bin';
-use PerlACE::Run_Test;
+unshift @INC, '../../../../../bin';
+require ACEutils;
+require Uniqueid;
+use Cwd;
 
+$cwd = getcwd();
+ACE::checkForTarget($cwd);
 $status = 0;
 
-$conf_file = PerlACE::LocalFile ('exhaustive.conf');
-
-@dispatching_configs   = ("-ECDispatching reactive",
-                          "-ECDispatching mt -ECDispatchingThreads 4");
-@collection_strategies = ("copy_on_read", 
-                          "copy_on_write", 
-                          "delayed");
-@collection_types      = ("list", 
-                          "rb_tree");
-@filtering_configs     = ("-ECFiltering prefix -ECSupplierFilter per-supplier",
-                          "-ECFiltering prefix -ECSupplierFilter null");
+$conf_file = 'exhaustive.conf';
+@dispatching_configs = ("-ECDispatching reactive",
+			"-ECDispatching mt -ECDispatchingThreads 4");
+@collection_strategies = ("copy_on_read",
+			  "copy_on_write",
+			  "delayed");
+@collection_types = ("list", "rb_tree");
+@filtering_configs = ("-ECFiltering prefix -ECSupplierFilter per-supplier",
+		      "-ECFiltering prefix -ECSupplierFilter null");
 
 foreach $d (@dispatching_configs) {
-    foreach $f (@filtering_configs) {
-        foreach $c (@collection_strategies) {
-            foreach $t (@collection_types) {
-                my $collection = "mt:".$c.":".$t;
-                
-                my $config = 'static EC_Factory "'
-                             .$d
-                             ." -ECProxyPushConsumerCollection ".$collection
-                             ." -ECProxyPushSupplierCollection ".$collection
-                             ." ".$f
-                             .'"';
-
-                open (CONFIG,">$conf_file") || die "Cannot open $conf_file\n";
-                print CONFIG $config, "\n";
-                close (CONFIG);
-
-                print STDERR "\n\n", $config, "\n";
-
-                system ("purify.exe "
-                        . "/run .\\Release\\Random.exe "
-                        . " -ORBSvcConf $conf_file"
-                        . " -suppliers 16"
-                        . " -consumers 16"
-                        . " -max_recursion 0");
-            }
-        }
+  foreach $f (@filtering_configs) {
+    foreach $c (@collection_strategies) {
+      foreach $t (@collection_types) {
+	local $collection = "mt:".$c.":".$t;
+	local $config =
+	  'static EC_Factory "'
+	  .$d
+	  ." -ECProxyPushConsumerCollection ".$collection
+	  ." -ECProxyPushSupplierCollection ".$collection
+	  ." ".$f
+	  .'"';
+	open (CONFIG,">$conf_file")
+	  || die "Cannot open $conf_file\n";
+	print CONFIG $config, "\n";
+	close (CONFIG);
+
+	print STDERR "\n\n", $config, "\n";
+
+	system ("purify.exe ".
+			      "/run .\\Release\\Random.exe ".
+			      " -ORBSvcConf "
+			      .$cwd.$DIR_SEPARATOR.
+			      "$conf_file"
+			      ." -suppliers 16"
+			      ." -consumers 16"
+			      ." -max_recursion 0");
+# $T = Process::Create ("c:\\Program Files\\Rational\\Purify\\purify.exe"
+#	if ($T->TimedWait (900) == -1) {
+#	  print STDERR "ERROR: Test timedout\n";
+#	  $status = 1;
+#	  $T->Kill (); $T->TimedWait (1);
+#	}
+      }
     }
+  }
 }
 
 unlink "$conf_file";