diff options
author | Johnny Willemsen <jwillemsen@remedy.nl> | 2012-03-23 20:25:26 +0000 |
---|---|---|
committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2012-03-23 20:25:26 +0000 |
commit | 14bb6ddf5ee690acf816a562d95181ff0d734799 (patch) | |
tree | 21ae47790b7529908febba75cae719daadbf84f3 | |
parent | 9658e8550db0443de913faf68fff2ca07768e5f3 (diff) | |
download | ATCD-14bb6ddf5ee690acf816a562d95181ff0d734799.tar.gz |
Fri Mar 23 20:24:42 UTC 2012 Johnny Willemsen <jwillemsen@remedy.nl>
* tests/Bug_4009_Regression/Bug_4009_Bar.idl:
* tests/Bug_4009_Regression/Bug_4009_Bar.mpc:
* tests/Bug_4009_Regression/Bug_4009_Foo.idl:
* tests/Bug_4009_Regression/Bug_4009_Foo.mpc:
New unit test for bugzilla 4009, uncovers a bug when generating
the CIAO executor
-rw-r--r-- | CIAO/ChangeLog | 9 | ||||
-rw-r--r-- | CIAO/tests/Bug_4009_Regression/Bug_4009_Bar.idl | 14 | ||||
-rw-r--r-- | CIAO/tests/Bug_4009_Regression/Bug_4009_Bar.mpc | 107 | ||||
-rw-r--r-- | CIAO/tests/Bug_4009_Regression/Bug_4009_Foo.idl | 18 | ||||
-rw-r--r-- | CIAO/tests/Bug_4009_Regression/Bug_4009_Foo.mpc | 106 |
5 files changed, 254 insertions, 0 deletions
diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog index bf1d61b3f45..79b0c237cbd 100644 --- a/CIAO/ChangeLog +++ b/CIAO/ChangeLog @@ -1,3 +1,12 @@ +Fri Mar 23 20:24:42 UTC 2012 Johnny Willemsen <jwillemsen@remedy.nl> + + * tests/Bug_4009_Regression/Bug_4009_Bar.idl: + * tests/Bug_4009_Regression/Bug_4009_Bar.mpc: + * tests/Bug_4009_Regression/Bug_4009_Foo.idl: + * tests/Bug_4009_Regression/Bug_4009_Foo.mpc: + New unit test for bugzilla 4009, uncovers a bug when generating + the CIAO executor + Fri Mar 23 19:39:28 UTC 2012 Johnny Willemsen <jwillemsen@remedy.nl> * tests/IDL_Test/Cornucopia/Cornucopia.idl: diff --git a/CIAO/tests/Bug_4009_Regression/Bug_4009_Bar.idl b/CIAO/tests/Bug_4009_Regression/Bug_4009_Bar.idl new file mode 100644 index 00000000000..7000a0e484e --- /dev/null +++ b/CIAO/tests/Bug_4009_Regression/Bug_4009_Bar.idl @@ -0,0 +1,14 @@ +// $Id$ + +#include "Bug_4009_Foo.idl" + +#pragma ciao lem "Bug_4009_BarE.idl" + +module BarMod +{ + component SequenceComp + { + attribute BarMod::TestOfLongSeq myAttribute; + }; +}; + diff --git a/CIAO/tests/Bug_4009_Regression/Bug_4009_Bar.mpc b/CIAO/tests/Bug_4009_Regression/Bug_4009_Bar.mpc new file mode 100644 index 00000000000..d01526ae51f --- /dev/null +++ b/CIAO/tests/Bug_4009_Regression/Bug_4009_Bar.mpc @@ -0,0 +1,107 @@ +// $Id$ +// This file is generated with "generate_component_mpc.pl Bug_4009_Bar" + +project(Bug_4009_Bar_idl_gen) : componentidldefaults { + after += Bug_4009_Foo_idl_gen + custom_only = 1 + idlflags += -Wb,stub_export_macro=IC_BAR_STUB_Export \ + -Wb,stub_export_include=Bug_4009_Bar_stub_export.h \ + -Wb,skel_export_macro=IC_BAR_SVNT_Export \ + -Wb,skel_export_include=Bug_4009_Bar_svnt_export.h \ + -Wb,exec_export_macro=IC_BAR_EXEC_Export \ + -Wb,exec_export_include=Bug_4009_Bar_exec_export.h \ + -Gex + + IDL_Files { + Bug_4009_Bar.idl + } +} + +project(Bug_4009_Bar_lem_gen) : ciaoidldefaults { + after += Bug_4009_Bar_idl_gen + custom_only = 1 + idlflags += -Wb,export_macro=IC_BAR_EXEC_Export \ + -Wb,export_include=Bug_4009_Bar_exec_export.h \ + -SS + + IDL_Files { + Bug_4009_BarE.idl + } +} + +project(Bug_4009_Bar_stub) : ccm_stub { + after += Bug_4009_Bar_idl_gen Bug_4009_Foo_lem_gen + libs += + + sharedname = Bug_4009_Bar_stub + dynamicflags += IC_BAR_STUB_BUILD_DLL + + IDL_Files { + } + + Source_Files { + Bug_4009_BarC.cpp + } + + Header_Files { + Bug_4009_BarC.h + Bug_4009_Bar_stub_export.h + } + + Inline_Files { + Bug_4009_BarC.inl + } +} + +project(Bug_4009_Bar_exec) : ciao_executor { + sharedname = Bug_4009_Bar_exec + after += Bug_4009_Bar_lem_gen Bug_4009_Bar_stub + libs += Bug_4009_Bar_stub +requires += dummy_label + dynamicflags += IC_BAR_EXEC_BUILD_DLL + + IDL_Files { + } + + Source_Files { + Bug_4009_BarEC.cpp + Bug_4009_Bar_exec.cpp + } + + Header_Files { + Bug_4009_BarEC.h + Bug_4009_Bar_exec.h + Bug_4009_Bar_exec_export.h + } + + Inline_Files { + Bug_4009_BarEC.inl + } +} + +project(Bug_4009_Bar_svnt) : ciao_servant { + sharedname = Bug_4009_Bar_svnt + after += Bug_4009_Bar_exec Bug_4009_Foo_exec Bug_4009_Bar_stub Bug_4009_Foo_svnt Bug_4009_Foo_stub + libs += Bug_4009_Bar_exec Bug_4009_Foo_exec Bug_4009_Bar_stub Bug_4009_Foo_svnt Bug_4009_Foo_stub + + dynamicflags += IC_BAR_SVNT_BUILD_DLL + + IDL_Files { + } + + Source_Files { + Bug_4009_BarS.cpp + Bug_4009_Bar_svnt.cpp + } + + Header_Files { + Bug_4009_BarS.h + Bug_4009_Bar_svnt.h + Bug_4009_Bar_svnt_export.h + } + + Inline_Files { + } +} + + diff --git a/CIAO/tests/Bug_4009_Regression/Bug_4009_Foo.idl b/CIAO/tests/Bug_4009_Regression/Bug_4009_Foo.idl new file mode 100644 index 00000000000..c36c9bf6240 --- /dev/null +++ b/CIAO/tests/Bug_4009_Regression/Bug_4009_Foo.idl @@ -0,0 +1,18 @@ +// $Id$ +#ifndef IC_Foo_IDL +#define IC_Foo_IDL + +#include <Components.idl> + +#pragma ciao lem "Bug_4009_BarE.idl" + +component Foo +{ +}; + +module BarMod +{ + typedef sequence<long> TestOfLongSeq; +}; + +#endif diff --git a/CIAO/tests/Bug_4009_Regression/Bug_4009_Foo.mpc b/CIAO/tests/Bug_4009_Regression/Bug_4009_Foo.mpc new file mode 100644 index 00000000000..c9c13cb04df --- /dev/null +++ b/CIAO/tests/Bug_4009_Regression/Bug_4009_Foo.mpc @@ -0,0 +1,106 @@ +// $Id$ +// This file is generated with "generate_component_mpc.pl Bug_4009_Foo" + +project(Bug_4009_Foo_idl_gen) : componentidldefaults { + custom_only = 1 + idlflags += -Wb,stub_export_macro=IC_FOO_STUB_Export \ + -Wb,stub_export_include=Bug_4009_Foo_stub_export.h \ + -Wb,skel_export_macro=IC_FOO_SVNT_Export \ + -Wb,skel_export_include=Bug_4009_Foo_svnt_export.h \ + -Wb,exec_export_macro=IC_FOO_EXEC_Export \ + -Wb,exec_export_include=Bug_4009_Foo_exec_export.h \ + -Gex + + IDL_Files { + Bug_4009_Foo.idl + } +} + +project(Bug_4009_Foo_lem_gen) : ciaoidldefaults { + after += Bug_4009_Foo_idl_gen Bug_4009_Bar_idl_gen + custom_only = 1 + idlflags += -Wb,export_macro=IC_FOO_EXEC_Export \ + -Wb,export_include=Bug_4009_Foo_exec_export.h \ + -SS + + IDL_Files { + Bug_4009_FooE.idl + } +} + +project(Bug_4009_Foo_stub) : ccm_stub { + after += Bug_4009_Foo_idl_gen + libs += + + sharedname = Bug_4009_Foo_stub + dynamicflags += IC_FOO_STUB_BUILD_DLL + + IDL_Files { + } + + Source_Files { + Bug_4009_FooC.cpp + } + + Header_Files { + Bug_4009_FooC.h + Bug_4009_Foo_stub_export.h + } + + Inline_Files { + Bug_4009_FooC.inl + } +} + +project(Bug_4009_Foo_exec) : ciao_executor { + sharedname = Bug_4009_Foo_exec + after += Bug_4009_Foo_lem_gen Bug_4009_Foo_stub + libs += Bug_4009_Foo_stub + + dynamicflags += IC_FOO_EXEC_BUILD_DLL + + IDL_Files { + } + + Source_Files { + Bug_4009_FooEC.cpp + Bug_4009_Foo_exec.cpp + } + + Header_Files { + Bug_4009_FooEC.h + Bug_4009_Foo_exec.h + Bug_4009_Foo_exec_export.h + } + + Inline_Files { + Bug_4009_FooEC.inl + } +} + +project(Bug_4009_Foo_svnt) : ciao_servant { + sharedname = Bug_4009_Foo_svnt + after += Bug_4009_Foo_exec + libs += Bug_4009_Foo_stub Bug_4009_Foo_exec + + dynamicflags += IC_FOO_SVNT_BUILD_DLL + + IDL_Files { + } + + Source_Files { + Bug_4009_FooS.cpp + Bug_4009_Foo_svnt.cpp + } + + Header_Files { + Bug_4009_FooS.h + Bug_4009_Foo_svnt.h + Bug_4009_Foo_svnt_export.h + } + + Inline_Files { + } +} + + |