Tue Apr 15 15:11:48 UTC 2014 Phil Mesnier <mesnier_p@ociweb.com>

        * bin/tao_other_tests.lst:
        * orbsvcs/tests/Trading/export_test.cpp:
        * orbsvcs/tests/Trading/run_test.pl:
	  more wchar scoreboard cleanup.

4 files changed, 25 insertions, 24 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 7e72e911bcb..65f382f34fd 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,10 @@
+Tue Apr 15 15:11:48 UTC 2014  Phil Mesnier  <mesnier_p@ociweb.com>
+
+        * bin/tao_other_tests.lst:
+        * orbsvcs/tests/Trading/export_test.cpp:
+        * orbsvcs/tests/Trading/run_test.pl:
+	  more wchar scoreboard cleanup.
+
 Mon Apr 14 16:11:02 UTC 2014  Phil Mesnier  <mesnier_p@ociweb.com>
 
         * orbsvcs/orbsvcs/PortableGroup/UIPMC_Connector.cpp:
diff --git a/TAO/bin/tao_other_tests.lst b/TAO/bin/tao_other_tests.lst
index be4ca43ee69..e508e5c148e 100644
--- a/TAO/bin/tao_other_tests.lst
+++ b/TAO/bin/tao_other_tests.lst
@@ -148,7 +148,7 @@ TAO/orbsvcs/tests/ImplRepo/servers_interact_on_startup/run_test.pl -hide_server
 TAO/orbsvcs/tests/ImplRepo/servers_interact_on_startup/run_test.pl -multistart: !ST !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !WCHAR !ACE_FOR_TAO !LynxOS !OpenVMS
 TAO/orbsvcs/tests/ImplRepo/ping_interrupt/run_test.pl: !ST !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !WCHAR !ACE_FOR_TAO !LynxOS !OpenVMS
 TAO/orbsvcs/tests/ImplRepo/link_poas/run_test.pl: !ST !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !WCHAR !ACE_FOR_TAO !LynxOS !OpenVMS
-TAO/orbsvcs/examples/ImR/Combined_Service/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !STATIC !ST !ACE_FOR_TAO !LynxOS
+TAO/orbsvcs/examples/ImR/Combined_Service/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !STATIC !ST !ACE_FOR_TAO !LynxOS !WCHAR
 TAO/orbsvcs/examples/CosEC/TypedSimple/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !NO_IFR !ACE_FOR_TAO !WCHAR
 TAO/orbsvcs/tests/CosEvent/Timeout/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ST !NO_MESSAGING !ACE_FOR_TAO !LynxOS
 TAO/orbsvcs/tests/Log/Basic_Log_Test/run_test.pl: !NO_MESSAGING !ACE_FOR_TAO !CORBA_E_MICRO
@@ -235,7 +235,7 @@ TAO/orbsvcs/tests/Bug_2709_Regression/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CO
 TAO/orbsvcs/tests/Bug_2800_Regression/run_test.pl: !ST !CORBA_E_MICRO
 TAO/orbsvcs/tests/Bug_2800_Regression/run_test_federated.pl: !ST !CORBA_E_MICRO
 TAO/orbsvcs/tests/Bug_3673_Regression/run_test.pl: !ST !CORBA_E_MICRO
-TAO/orbsvcs/tests/Bug_3891_Regression/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO
+TAO/orbsvcs/tests/Bug_3891_Regression/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !WCHAR
 TAO/orbsvcs/examples/Notify/Filter/run_test.pl: !ST !NO_MESSAGING !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ACE_FOR_TAO
 TAO/orbsvcs/examples/Notify/Subscribe/run_test.pl: !ST !NO_MESSAGING !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ACE_FOR_TAO
 TAO/orbsvcs/tests/Bug_2925_Regression/run_test.pl: !ST !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !STATIC
diff --git a/TAO/orbsvcs/tests/Trading/export_test.cpp b/TAO/orbsvcs/tests/Trading/export_test.cpp
index c2a4e1c6657..51b8290b283 100644
--- a/TAO/orbsvcs/tests/Trading/export_test.cpp
+++ b/TAO/orbsvcs/tests/Trading/export_test.cpp
@@ -142,25 +142,18 @@ int failure = 0;
       ACE_DEBUG ((LM_DEBUG, ACE_TEXT("*** Offer Exporter tests complete.\n")));
       ACE_DEBUG ((LM_DEBUG, ACE_TEXT("*** Now serving dynamic properties.\n")));
 
-      // Next file can flag other external apps that we now arrived at serving
-      // dynamic properties.
-      size_t offset = 0;
-      ACE_TCHAR file[1024];
-      ACE_OS::strcpy(file, argv[0]);
-      if ((offset = (size_t)ACE_OS::strrchr(file, ACE_TEXT('/'))) != 0) {
-        offset -= ((size_t)file - 1);
-      }
-      ACE_OS::strcpy(file + offset, done_file);
-
-      FILE *ready_file =
-        ACE_OS::fopen (file, "w");
-      if (ready_file != 0) {
-        ACE_OS::fprintf (ready_file, "The export test is ready\n");
-        ACE_OS::fclose (ready_file);
-      }
-      else {
-        ACE_DEBUG ((LM_WARNING, ACE_TEXT("Unable to open %s for output.\n"), file));
-      }
+      FILE *ready_file = ACE_OS::fopen (done_file, ACE_TEXT("w"));
+      if (ready_file != 0) 
+        {
+          ACE_OS::fprintf (ready_file, "The export test is ready\n");
+          ACE_OS::fclose (ready_file);
+        }
+      else
+        {
+          ACE_DEBUG ((LM_WARNING, 
+                      ACE_TEXT("Unable to open %s for output.\n"), 
+                      done_file));
+        }
 
       orb_manager.run ();
     }
diff --git a/TAO/orbsvcs/tests/Trading/run_test.pl b/TAO/orbsvcs/tests/Trading/run_test.pl
index 25cce571765..666a635e8fb 100755
--- a/TAO/orbsvcs/tests/Trading/run_test.pl
+++ b/TAO/orbsvcs/tests/Trading/run_test.pl
@@ -41,13 +41,14 @@ my $export_ready_file = $export_test->LocalFile ($ready);
 $export_test->DeleteFile($ready);
 
 $SV = $server->CreateProcess ("../../Trading_Service/tao_costrading",
-                              "-ORBdebuglevel $debug_level " .
+                              "-ORBdebuglevel $debug_level ".
+                              "-ORBlogfile trader.log " .
                               "-ORBEndpoint iiop://:$port " .
                               "-TSdumpior $server_iorfile");
 
 $CL1 = $export_test->CreateProcess ("export_test",
                                    "-ORBInitRef TradingService=corbaloc:::$port/TradingService " .
-                                   "-d $ready " .
+                                   "-d $export_ready_file " .
                                    "-quiet");
 
 $CL2 = $import_test->CreateProcess ("import_test",
@@ -78,7 +79,7 @@ if ($client_status != 0) {
 
 if ($export_test->WaitForFileTimed ($ready,
                                $export_test->ProcessStartWaitInterval()) == -1) {
-    print STDERR "ERROR: cannot find file <$server_iorfile>\n";
+    print STDERR "ERROR: cannot find file <$ready>\n";
     $SV->Kill (); $SV->TimedWait (1);
     $CL1->Kill (); $CL1->TimedWait (1);
     exit 1;