10 files changed, 73 insertions, 0 deletions
diff --git a/TAO/tests/Bug_2375_Regression/Bug_2375_Regression.mpc b/TAO/tests/Bug_2375_Regression/Bug_2375_Regression.mpc
new file mode 100755
index 00000000000..d428b0fce50
--- /dev/null
+++ b/TAO/tests/Bug_2375_Regression/Bug_2375_Regression.mpc
@@ -0,0 +1,8 @@
+// -*- MPC -*-
+// $Id$
+project (*Test) : taoserver, valuetype {
+  exename = test
+  Source_Files {
+    test.cpp
+    }
+}
diff --git a/TAO/tests/Bug_2375_Regression/README b/TAO/tests/Bug_2375_Regression/README
new file mode 100755
index 00000000000..97b642530a1
--- /dev/null
+++ b/TAO/tests/Bug_2375_Regression/README
@@ -0,0 +1,5 @@
+// $Id$
+
+A build only test to check that the c++ source produced from an IDL file with a valuetype factory in it compiles OK.
+
+If it builds it's passed.
diff --git a/TAO/tests/Bug_2375_Regression/test.cpp b/TAO/tests/Bug_2375_Regression/test.cpp
new file mode 100755
index 00000000000..2a2d57db0e7
--- /dev/null
+++ b/TAO/tests/Bug_2375_Regression/test.cpp
@@ -0,0 +1,11 @@
+// $Id$
+#include "testC.h"
+class  MyTestValuetypeFactory : public TestValuetype_init {
+public:
+  virtual TestValuetype* create (::CORBA::Boolean, ::CORBA::Short) {return 0;};
+  virtual TAO_OBV_CREATE_RETURN_TYPE (TestValuetype) create_for_unmarshal (void) {return 0;};
+};
+int main (int , char *[]) {
+  MyTestValuetypeFactory myFactory;
+  return 0;
+}
diff --git a/TAO/tests/Bug_2375_Regression/test.idl b/TAO/tests/Bug_2375_Regression/test.idl
new file mode 100755
index 00000000000..a6ee7413825
--- /dev/null
+++ b/TAO/tests/Bug_2375_Regression/test.idl
@@ -0,0 +1,5 @@
+// $Id$
+valuetype TestValuetype {
+  factory create(in boolean b, in short s);
+};
+
diff --git a/TAO/tests/Bug_2399_Regression/Bug_2399_Regression.mpc b/TAO/tests/Bug_2399_Regression/Bug_2399_Regression.mpc
new file mode 100644
index 00000000000..6397809c1be
--- /dev/null
+++ b/TAO/tests/Bug_2399_Regression/Bug_2399_Regression.mpc
@@ -0,0 +1,11 @@
+// -*- MPC -*-
+// $Id$
+project (*Test) : taoserver {
+  exename = test
+  idlflags += -t ./mytmp
+
+  Source_Files {
+    test.cpp
+    }
+}
+
diff --git a/TAO/tests/Bug_2399_Regression/README b/TAO/tests/Bug_2399_Regression/README
new file mode 100644
index 00000000000..a4c048250b6
--- /dev/null
+++ b/TAO/tests/Bug_2399_Regression/README
@@ -0,0 +1,8 @@
+# $Id$
+
+This is a build only test. A failure in the IDL compilation will probably indicate a regression.
+
+The IDL is compiled with a temporary file location specified using the -t parameter. The location is ./mytmp/.
+
+The file included.idl in ./mytmp/. is uncompilable - the test is intended to prove that it is not getting included instead of the correct included.idl (the one in *this* directory).
+
diff --git a/TAO/tests/Bug_2399_Regression/included.idl b/TAO/tests/Bug_2399_Regression/included.idl
new file mode 100644
index 00000000000..ed8e9a102a1
--- /dev/null
+++ b/TAO/tests/Bug_2399_Regression/included.idl
@@ -0,0 +1,5 @@
+// $Id$
+
+interface Parent
+{
+};
diff --git a/TAO/tests/Bug_2399_Regression/mytmp/included.idl b/TAO/tests/Bug_2399_Regression/mytmp/included.idl
new file mode 100644
index 00000000000..df4a6fa7b06
--- /dev/null
+++ b/TAO/tests/Bug_2399_Regression/mytmp/included.idl
@@ -0,0 +1,3 @@
+// $Id$
+
+This file should not be compiled at all.
diff --git a/TAO/tests/Bug_2399_Regression/test.cpp b/TAO/tests/Bug_2399_Regression/test.cpp
new file mode 100644
index 00000000000..1b3f75330f2
--- /dev/null
+++ b/TAO/tests/Bug_2399_Regression/test.cpp
@@ -0,0 +1,10 @@
+// $Id$
+
+#include "testC.h"
+
+int
+main (int , char *[])
+{
+  return 0;
+}
+
diff --git a/TAO/tests/Bug_2399_Regression/test.idl b/TAO/tests/Bug_2399_Regression/test.idl
new file mode 100644
index 00000000000..b0e1cbac672
--- /dev/null
+++ b/TAO/tests/Bug_2399_Regression/test.idl
@@ -0,0 +1,7 @@
+// $Id$
+
+#include "included.idl"
+
+interface Child : Parent
+{
+};