ChangeLogTag: Fri Apr 10 12:44:12 UTC 2009 Vladimir Zykov <vz@prismtech.com>

5 files changed, 16 insertions, 51 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index aa7d341e637..b708ac39e2d 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,13 @@
+Fri Apr 10 12:44:12 UTC 2009  Vladimir Zykov  <vz@prismtech.com>
+
+        * tests/Sequence_Unit_Tests/clean_tao_export.pl:
+        * tests/Sequence_Unit_Tests/run_test.pl:
+        * tests/Sequence_Unit_Tests/unbounded_octet_sequence_nocopy_ut.cpp:
+        * tests/Sequence_Unit_Tests/Sequence_Unit_Tests.mpc:
+
+          Reverted my previous attempts to fix this test on windows
+          and disabled unbounded octet sequence test on this platform.
+
 Fri Apr 10 12:17:16 UTC 2009  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * bin/tao_orb_tests.lst:
diff --git a/TAO/tests/Sequence_Unit_Tests/Sequence_Unit_Tests.mpc b/TAO/tests/Sequence_Unit_Tests/Sequence_Unit_Tests.mpc
index eef7b2903d9..6e76ff7bee5 100644
--- a/TAO/tests/Sequence_Unit_Tests/Sequence_Unit_Tests.mpc
+++ b/TAO/tests/Sequence_Unit_Tests/Sequence_Unit_Tests.mpc
@@ -89,21 +89,8 @@ project(*UB_Octet_Sequence): taoexe {
   }
 }
 
-// On Win32 we cannot build this test as taoexe since
-// it will import unbounded_value_sequence<CORBA::Octet>
-// and other related things from TAO.dll but this test
-// requires that unbounded_value_sequence is a template
-// and will be compiled into the tests code. So, only for
-// this test we copy original Unbounded_Octet_Sequence_T.h
-// and remove all occurences of TAO_Export from it.
-project(*UB_Oct_Seq_No_Cpy): aceexe {
+project(*UB_Oct_Seq_No_Cpy): taoexe {
   exename = unbounded_octet_sequence_nocopy_ut
-  includes += $(TAO_ROOT)
-  specific (!automake, !gnuace) {
-    prebuild  = <%cp%> $(TAO_ROOT)<%slash%>tao<%slash%>Unbounded_Octet_Sequence_T.h Unbounded_Octet_Sequence_T.h <%and%> \
-                perl clean_tao_export.pl Unbounded_Octet_Sequence_T.h
-    postbuild = <%rm%> Unbounded_Octet_Sequence_T.h
-  }
   Source_Files {
     mock_reference.cpp
     unbounded_octet_sequence_nocopy_ut.cpp
diff --git a/TAO/tests/Sequence_Unit_Tests/clean_tao_export.pl b/TAO/tests/Sequence_Unit_Tests/clean_tao_export.pl
deleted file mode 100755
index 7229d1b8643..00000000000
--- a/TAO/tests/Sequence_Unit_Tests/clean_tao_export.pl
+++ /dev/null
@@ -1,28 +0,0 @@
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
-     & eval 'exec perl -S $0 $argv:q'
-     if 0;
-
-# $Id$
-# -*- perl -*-
-
-use strict;
-
-my $file_to_clean = $ARGV[0];
-
-my @new_file_contents = ();
-open (IFILE, $file_to_clean) or die "Can't open $file_to_clean: $!\n";
-while (<IFILE>) {
-    my $line = $_;
-    if ($line =~ /^(.*)\s+TAO_Export\s+(.*)$/g) {
-        push @new_file_contents, "$1 $2\n";
-    } else {
-        push @new_file_contents, $line;
-    }
-}
-close IFILE;
-
-open (OFILE, ">$file_to_clean") or die "Can't open $file_to_clean: $!\n";
-print OFILE @new_file_contents;
-close OFILE;
-
-exit 0;
diff --git a/TAO/tests/Sequence_Unit_Tests/run_test.pl b/TAO/tests/Sequence_Unit_Tests/run_test.pl
index ae78b6e5985..2de72fc741f 100755
--- a/TAO/tests/Sequence_Unit_Tests/run_test.pl
+++ b/TAO/tests/Sequence_Unit_Tests/run_test.pl
@@ -18,7 +18,6 @@ my @testsToRun = qw(unbounded_value_sequence_ut
                bounded_string_sequence_ut
                testing_allocation_traits_ut
                unbounded_octet_sequence_ut
-               unbounded_octet_sequence_nocopy_ut
                object_reference_sequence_element_ut
                unbounded_object_reference_sequence_ut
                unbounded_fwd_object_reference_sequence_ut
@@ -32,6 +31,10 @@ my @testsToRun = qw(unbounded_value_sequence_ut
                Bounded_String
               );
 
+if ($^O ne "MSWin32") {
+    push @testsToRun, qw(unbounded_octet_sequence_nocopy_ut);
+}
+
 foreach my $process (@testsToRun) {
 
     my $server = PerlACE::TestTarget::create_target (1) || die "Create target 1 failed\n";
diff --git a/TAO/tests/Sequence_Unit_Tests/unbounded_octet_sequence_nocopy_ut.cpp b/TAO/tests/Sequence_Unit_Tests/unbounded_octet_sequence_nocopy_ut.cpp
index fc164025fa8..0bc62b60efa 100644
--- a/TAO/tests/Sequence_Unit_Tests/unbounded_octet_sequence_nocopy_ut.cpp
+++ b/TAO/tests/Sequence_Unit_Tests/unbounded_octet_sequence_nocopy_ut.cpp
@@ -11,14 +11,7 @@
 #include "testing_allocation_traits.hpp"
 #include "testing_range_checking.hpp"
 
-#if defined (ACE_WIN32) || defined (ACE_WIN64)
-// This is a unit test and we use our local slightly
-// modified Unbounded_Octet_Sequence_T.h. See mpc file
-// for details.
-# include "Unbounded_Octet_Sequence_T.h"
-#else
-# include "tao/Unbounded_Octet_Sequence_T.h"
-#endif
+#include "tao/Unbounded_Octet_Sequence_T.h"
 
 #include "value_sequence_tester.hpp"