diff options
author | Johnny Willemsen <jwillemsen@remedy.nl> | 2010-12-08 16:35:39 +0000 |
---|---|---|
committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2010-12-08 16:35:39 +0000 |
commit | 011d9aef9b8ea541ce210140547a0b5bdf9ddac1 (patch) | |
tree | d019e526b4866cbc63682cbb8f0e5bee15a8b1d7 | |
parent | 7b9f9f33edb195d6748ec2a33c2e9ac370617e27 (diff) | |
download | ATCD-011d9aef9b8ea541ce210140547a0b5bdf9ddac1.tar.gz |
Wed Dec 8 17:34:33 UTC 2010 Johnny Willemsen <jwillemsen@remedy.nl>
* tests/Bug_3936_Regression:
* tests/Bug_3937_Regression:
Two new idl tests, will enable them in the test suite after
the release
-rw-r--r-- | CIAO/ChangeLog | 7 | ||||
-rw-r--r-- | CIAO/tests/Bug_3936_Regression/Bug_3936_Regression.idl | 26 | ||||
-rwxr-xr-x | CIAO/tests/Bug_3936_Regression/run_test.pl | 46 | ||||
-rw-r--r-- | CIAO/tests/Bug_3937_Regression/Bug_3937_Regression.idl | 45 | ||||
-rwxr-xr-x | CIAO/tests/Bug_3937_Regression/run_test.pl | 46 |
5 files changed, 170 insertions, 0 deletions
diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog index 6764f97f26e..8573b953fc8 100644 --- a/CIAO/ChangeLog +++ b/CIAO/ChangeLog @@ -1,3 +1,10 @@ +Wed Dec 8 17:34:33 UTC 2010 Johnny Willemsen <jwillemsen@remedy.nl> + + * tests/Bug_3936_Regression: + * tests/Bug_3937_Regression: + Two new idl tests, will enable them in the test suite after + the release + Wed Dec 8 14:28:53 UTC 2010 Martin Corino <corino_m@remedy.nl> * connectors/ami4ccm/tests/AsynchT/Sender/AsynchTA_conn_i.h: diff --git a/CIAO/tests/Bug_3936_Regression/Bug_3936_Regression.idl b/CIAO/tests/Bug_3936_Regression/Bug_3936_Regression.idl new file mode 100644 index 00000000000..bb51553b796 --- /dev/null +++ b/CIAO/tests/Bug_3936_Regression/Bug_3936_Regression.idl @@ -0,0 +1,26 @@ +// $Id$ + +#include <Components.idl> + +module Foo <typename T, sequence <T> TSeq> +{ + local interface Bar + { + void ope (); + }; + porttype Write + { + provides Bar mybar; + }; + connector MyBaseEvent + { + mirrorport Write supplier; + }; +}; + +module Foo <typename T, sequence <T> TSeq> +{ + connector MyConn : Typed::MyBaseEvent + { + }; +}; diff --git a/CIAO/tests/Bug_3936_Regression/run_test.pl b/CIAO/tests/Bug_3936_Regression/run_test.pl new file mode 100755 index 00000000000..82a4fb257b2 --- /dev/null +++ b/CIAO/tests/Bug_3936_Regression/run_test.pl @@ -0,0 +1,46 @@ + +# $Id$ + +eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' + & eval 'exec perl -S $0 $argv:q' + if 0; + +# -*- perl -*- + +use lib "$ENV{ACE_ROOT}/bin"; +use PerlACE::TestTarget; +use File::Spec; + +$status =0; + +open (OLDOUT, ">&STDOUT"); +open (STDOUT, ">" . File::Spec->devnull()); +open (OLDERR, ">&STDERR"); +open (STDERR, ">&STDOUT"); + +# The location of the tao_idl utility - depends on O/S +if ($^O eq "MSWin32"){ + $tao_idl = "../../../../../bin/tao_idl"; +} +else{ + $tao_idl = "../../../../..TAO/TAO_IDL/tao_idl"; +} + +my $server = PerlACE::TestTarget::create_target (1) || die "Create target 1 failed\n"; + +$input_file1 = $server->LocalFile ("Bug_3936_Regression.idl"); + +# Compile the IDL +$SV = $server->CreateProcess ("$tao_idl", "$input_file1"); + +$server_status1 = $SV->SpawnWaitKill ($server->ProcessStartWaitInterval()); + +open (STDOUT, ">&OLDOUT"); +open (STDERR, ">&OLDERR"); + +if ($server_status1 == 0) { + print STDERR "ERROR: tao_idl returned $server_status1 for $input_file1, should have failed\n"; + $status = 1; +} + +exit $status; diff --git a/CIAO/tests/Bug_3937_Regression/Bug_3937_Regression.idl b/CIAO/tests/Bug_3937_Regression/Bug_3937_Regression.idl new file mode 100644 index 00000000000..bf6f891ae9d --- /dev/null +++ b/CIAO/tests/Bug_3937_Regression/Bug_3937_Regression.idl @@ -0,0 +1,45 @@ +// $Id$ + +#include <Components.idl> + +module Foo <typename T, sequence <T> TSeq> +{ + local interface Bar + { + void ope (); + }; + porttype Write + { + provides Bar mybar; + }; + porttype Listen + { + provides Bar mybar; + }; + connector MyBaseEvent + { + mirrorport Write supplier; + mirrorport Listen consumer; + }; +}; + +module Foo <typename T, sequence <T> TSeq> +{ + connector MyConn : Foo::MyBaseEvent + { + }; +}; + +struct T +{ + long a; +}; + +typedef sequence <T> TSeq; +module Foo <T, TSeq> MyFooMod; + +component X +{ + port MyFooMod::Write myport; +}; + diff --git a/CIAO/tests/Bug_3937_Regression/run_test.pl b/CIAO/tests/Bug_3937_Regression/run_test.pl new file mode 100755 index 00000000000..5bcfd75604f --- /dev/null +++ b/CIAO/tests/Bug_3937_Regression/run_test.pl @@ -0,0 +1,46 @@ + +# $Id$ + +eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' + & eval 'exec perl -S $0 $argv:q' + if 0; + +# -*- perl -*- + +use lib "$ENV{ACE_ROOT}/bin"; +use PerlACE::TestTarget; +use File::Spec; + +$status =0; + +open (OLDOUT, ">&STDOUT"); +open (STDOUT, ">" . File::Spec->devnull()); +open (OLDERR, ">&STDERR"); +open (STDERR, ">&STDOUT"); + +# The location of the tao_idl utility - depends on O/S +if ($^O eq "MSWin32"){ + $tao_idl = "../../../../../bin/tao_idl"; +} +else{ + $tao_idl = "../../../../..TAO/TAO_IDL/tao_idl"; +} + +my $server = PerlACE::TestTarget::create_target (1) || die "Create target 1 failed\n"; + +$input_file1 = $server->LocalFile ("Bug_3937_Regression.idl"); + +# Compile the IDL +$SV = $server->CreateProcess ("$tao_idl", "$input_file1"); + +$server_status1 = $SV->SpawnWaitKill ($server->ProcessStartWaitInterval()); + +open (STDOUT, ">&OLDOUT"); +open (STDERR, ">&OLDERR"); + +if ($server_status1 == 0) { + print STDERR "ERROR: tao_idl returned $server_status1 for $input_file1, should have failed\n"; + $status = 1; +} + +exit $status; |