-
-
Notifications
You must be signed in to change notification settings - Fork 6
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #293 from jwillemsen/jwi-idl4structinheritance
Starter test for empty struct and struct inheritance
- Loading branch information
Showing
8 changed files
with
171 additions
and
5 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,22 @@ | ||
/** | ||
* @file client.cpp | ||
* @author Johnny Willemsen | ||
* | ||
* @brief CORBA C++11 client application | ||
* | ||
* @copyright Copyright (c) Remedy IT Expertise BV | ||
*/ | ||
|
||
#include "testC.h" | ||
|
||
int main (int /*argc*/, char* /*argv*/[]) | ||
{ | ||
// Just compilation test | ||
EmptyStruct es; | ||
X11_UNUSED_ARG(es); | ||
Point2D p2d; | ||
X11_UNUSED_ARG(p2d); | ||
Point3D p3d; | ||
X11_UNUSED_ARG(p3d); | ||
return 0; | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,69 @@ | ||
#--------------------------------------------------------------------- | ||
# @file run_illegal_idl3_test.pl | ||
# @author Mark Drijver | ||
# | ||
# @copyright Copyright (c) Remedy IT Expertise BV | ||
#--------------------------------------------------------------------- | ||
eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' | ||
& eval 'exec perl -S $0 $argv:q' | ||
if 0; | ||
|
||
print "IDL test\n"; | ||
|
||
use lib "$ENV{ACE_ROOT}/bin"; | ||
use PerlACE::TestTarget; | ||
use File::Spec; | ||
|
||
my $status =0; | ||
my $server = PerlACE::TestTarget::create_target(2) || die "Create target 2 failed\n"; | ||
|
||
# The location of the ridl utility | ||
my $ridl = "$ENV{X11_BASE_ROOT}/bin/ridlc"; | ||
|
||
unless (-e $ridl) { | ||
die "ERROR: Cannot find " . $ridl; | ||
} | ||
|
||
opendir(DIRH, ".") or die "Could not open dir. $!"; | ||
@files = grep(/\.idl$/,readdir(DIRH)); | ||
foreach (sort(@files)){ | ||
print "Testing ", $_, ": "; | ||
my $input_file = $_; | ||
|
||
#Redirect the screen output to the null device. | ||
open (OLDOUT, ">&STDOUT"); | ||
# open (STDOUT, ">" . File::Spec->devnull()); | ||
open (STDOUT, ">" . output); | ||
open (OLDERR, ">&STDERR"); | ||
open (STDERR, ">&STDOUT"); | ||
|
||
# Compile the IDL | ||
system ("$ridl", "$input_file"); | ||
|
||
#Redirect the null device output back to the screen | ||
open (STDOUT, ">&OLDOUT"); | ||
open (STDERR, ">&OLDERR"); | ||
|
||
$found = 0; | ||
open FILE, "<output"; | ||
while (my $line = <FILE>) | ||
{ | ||
#print $line; | ||
if ($line =~ "IDL::Parse") | ||
{ | ||
$found = 1; | ||
close FILE; | ||
last; | ||
} | ||
} | ||
#print "\nFound: " . $found; | ||
if ($found>0) { | ||
print "parsing failed as expected.\n"; | ||
} else { | ||
print STDERR "ERROR: Unable to detect expected ridlc error.\n"; | ||
$status = 1; | ||
} | ||
|
||
} | ||
|
||
exit $status; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,31 @@ | ||
#--------------------------------------------------------------------- | ||
# @file run_test.pl | ||
# @author Marcel Smit | ||
# | ||
# @copyright Copyright (c) Remedy IT Expertise BV | ||
#--------------------------------------------------------------------- | ||
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; | ||
|
||
my $target = PerlACE::TestTarget::create_target(2) || die "Create target 2 failed\n"; | ||
|
||
$status = 0; | ||
|
||
$SV = $target->CreateProcess ("client"); | ||
|
||
$server = $SV->SpawnWaitKill ($target->ProcessStartWaitInterval()); | ||
|
||
if ($server != 0) { | ||
print STDERR "ERROR: const returned $server\n"; | ||
$status = 1; | ||
} | ||
|
||
$target->GetStderrLog(); | ||
|
||
exit $status; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,21 @@ | ||
/** | ||
* @file test.idl | ||
* @author Johnny Willemsen | ||
* | ||
* @copyright Copyright (c) Remedy IT Expertise BV | ||
*/ | ||
|
||
struct Point2D | ||
{ | ||
long x; | ||
long y; | ||
}; | ||
|
||
struct Point3D : Point2D | ||
{ | ||
long z; | ||
}; | ||
|
||
struct EmptyStruct | ||
{ | ||
}; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,21 @@ | ||
// -*- MPC -*- | ||
|
||
// No ostream ridl_ostream_defaults | ||
project(*struct_inheritance_gen_idl): ridl_defaults { | ||
IDL_Files { | ||
test.idl | ||
idlflags += --idl-version=4 | ||
} | ||
custom_only = 1 | ||
} | ||
|
||
project(*struct_inheritance_client): taox11_client { | ||
after += *struct_inheritance_gen_idl | ||
Source_Files { | ||
client.cpp | ||
} | ||
Source_Files { | ||
testC.cpp | ||
} | ||
} | ||
|