ChangeLogTag: Tue Apr 7 09:01:37 UTC 2009 Vladimir Zykov <vz@prismtech.com>

4 files changed, 55 insertions, 2 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 3eed4cfbe7c..e14c4f70edc 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,14 @@
+Tue Apr  7 09:01:37 UTC 2009  Vladimir Zykov  <vz@prismtech.com>
+
+        * tests/Sequence_Unit_Tests/clean_tao_export.pl:
+        * tests/Sequence_Unit_Tests/unbounded_octet_sequence_nocopy_ut.cpp:
+        * tests/Sequence_Unit_Tests/Sequence_Unit_Tests.mpc:
+
+          Fixed a test that uses specialization of unbounded_value_sequence
+          for CORBA::Octet on win32. This test requires that the above
+          specialization is compiled into tests code and not imported from
+          TAO.dll as it was done before.
+
 Mon Apr  6 13:39: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 6e76ff7bee5..cf97a1a6b77 100644
--- a/TAO/tests/Sequence_Unit_Tests/Sequence_Unit_Tests.mpc
+++ b/TAO/tests/Sequence_Unit_Tests/Sequence_Unit_Tests.mpc
@@ -89,8 +89,19 @@ project(*UB_Octet_Sequence): taoexe {
   }
 }
 
-project(*UB_Oct_Seq_No_Cpy): 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 {
   exename = unbounded_octet_sequence_nocopy_ut
+  includes += $(TAO_ROOT)
+  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
new file mode 100755
index 00000000000..7229d1b8643
--- /dev/null
+++ b/TAO/tests/Sequence_Unit_Tests/clean_tao_export.pl
@@ -0,0 +1,28 @@
+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/unbounded_octet_sequence_nocopy_ut.cpp b/TAO/tests/Sequence_Unit_Tests/unbounded_octet_sequence_nocopy_ut.cpp
index 0bc62b60efa..e70613d0e6c 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,7 +11,10 @@
 #include "testing_allocation_traits.hpp"
 #include "testing_range_checking.hpp"
 
-#include "tao/Unbounded_Octet_Sequence_T.h"
+// 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"
 
 #include "value_sequence_tester.hpp"