diff options
author | Johnny Willemsen <jwillemsen@remedy.nl> | 2010-10-28 12:23:51 +0000 |
---|---|---|
committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2010-10-28 12:23:51 +0000 |
commit | cbfc5d9c707853c8e4f780991f165a8fd81dc480 (patch) | |
tree | 2e89ad67507024bf77794ef5c0f8030f34e5659b | |
parent | d01346413bb53a5dca0ddd38b0c7cc989443c2fe (diff) | |
download | ATCD-cbfc5d9c707853c8e4f780991f165a8fd81dc480.tar.gz |
Thu Oct 28 12:19:07 UTC 2010 Johnny Willemsen <jwillemsen@remedy.nl>
* tests/IDL_Test/Bug_3312_Regression.idl:
* tests/IDL_Test/IDL_Test.mpc:
Added test for 3312, doesn't seem to be fixed yet
-rw-r--r-- | TAO/ChangeLog | 6 | ||||
-rw-r--r-- | TAO/tests/IDL_Test/Bug_3312_Regression.idl | 17 | ||||
-rw-r--r-- | TAO/tests/IDL_Test/IDL_Test.mpc | 11 |
3 files changed, 32 insertions, 2 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index fb1878857dc..ee0df84ce32 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,9 @@ +Thu Oct 28 12:19:07 UTC 2010 Johnny Willemsen <jwillemsen@remedy.nl> + + * tests/IDL_Test/Bug_3312_Regression.idl: + * tests/IDL_Test/IDL_Test.mpc: + Added test for 3312, doesn't seem to be fixed yet + Thu Oct 28 08:26:46 UTC 2010 Vladimir Zykov <vladimir.zykov@prismtech.com> * tests/Bug_3755_Ext_Regression/run_test.pl: diff --git a/TAO/tests/IDL_Test/Bug_3312_Regression.idl b/TAO/tests/IDL_Test/Bug_3312_Regression.idl new file mode 100644 index 00000000000..ac3a32fce21 --- /dev/null +++ b/TAO/tests/IDL_Test/Bug_3312_Regression.idl @@ -0,0 +1,17 @@ +// $Id$ + +module CallMe + { + union YourColorBaby switch (enum ColorMe { Red, Blue }) + { + case Red: long c_1; + case Blue: long c_2; + }; +// Disabled, see bug_3312 +/* union YourCar switch (enum ColorMe { Green, Pink }) + { + case Green: short c_1; + case Pink: short c_2; + }; +*/ + }; diff --git a/TAO/tests/IDL_Test/IDL_Test.mpc b/TAO/tests/IDL_Test/IDL_Test.mpc index bfc4dd1603d..24b692321d0 100644 --- a/TAO/tests/IDL_Test/IDL_Test.mpc +++ b/TAO/tests/IDL_Test/IDL_Test.mpc @@ -1,5 +1,6 @@ // -*- MPC -*- // $Id$ + project(*IDL): taoserver, messaging, gen_ostream { custom_only=1 idlflags += -GC -GH -Gd -GT @@ -22,6 +23,7 @@ project(*IDL): taoserver, messaging, gen_ostream { Bug_2616_Regression.idl Bug_2619_Regression.idl Bug_3243_Regression.idl + Bug_3312_Regression.idl Bug_3819_Regression.idl Bug_3821_Regression.idl full.idl @@ -115,6 +117,8 @@ project(*DLL): taoidldefaults, taolib, messaging { Bug_2619_RegressionS.cpp Bug_3243_RegressionC.cpp Bug_3243_RegressionS.cpp + Bug_3312_RegressionC.cpp + Bug_3312_RegressionS.cpp Bug_3819_RegressionC.cpp Bug_3819_RegressionS.cpp Bug_3821_RegressionC.cpp @@ -226,10 +230,10 @@ project(*Main): taoserver, messaging, gen_ostream { Source_Files { main.cpp } - + Header_Files { } - + Inline_Files { } @@ -252,6 +256,7 @@ project(*NDDS_IDL): ndds_ts_defaults { Bug_2616_Regression.idl Bug_2619_Regression.idl Bug_3243_Regression.idl + Bug_3312_Regression.idl Bug_3819_Regression.idl Bug_3821_Regression.idl constants.idl @@ -341,6 +346,8 @@ project(*NDDS_Lib): taolib, messaging, gen_ostream, nddslib { Bug_3243_Regression.cxx Bug_3243_RegressionPlugin.cxx Bug_3243_RegressionSupport.cxx + Bug_3312_RegressionPlugin.cxx + Bug_3312_RegressionSupport.cxx Bug_3819_Regression.cxx Bug_3819_RegressionPlugin.cxx Bug_3819_RegressionSupport.cxx |