diff options
| author | Adam Mitz <mitza-oci@users.noreply.github.com> | 2009-06-25 14:23:24 +0000 |
|---|---|---|
| committer | Adam Mitz <mitza-oci@users.noreply.github.com> | 2009-06-25 14:23:24 +0000 |
| commit | a19791458dda90163dca28155f93d85231759d91 (patch) | |
| tree | 1a026a2cd2f2c59612f2897a62de29540f2a2c10 | |
| parent | 4f8ec33d664657b2f14f8bbe31e8e6ab331bfad3 (diff) | |
| download | ATCD-a19791458dda90163dca28155f93d85231759d91.tar.gz | |
ChangeLogTag: Thu Jun 25 14:20:08 UTC 2009 Adam Mitz <mitza@ociweb.com>
| -rw-r--r-- | ACE/ChangeLog | 11 | ||||
| -rw-r--r-- | ACE/bin/ace_tests.lst | 1 | ||||
| -rw-r--r-- | ACE/tests/non_mpc_makefile/CustomMakefile | 9 | ||||
| -rw-r--r-- | ACE/tests/non_mpc_makefile/foo.cpp | 4 | ||||
| -rwxr-xr-x | ACE/tests/non_mpc_makefile/run_test.pl | 21 |
5 files changed, 46 insertions, 0 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog index f9ba5577d28..e2e43ffde20 100644 --- a/ACE/ChangeLog +++ b/ACE/ChangeLog @@ -1,3 +1,14 @@ +Thu Jun 25 14:20:08 UTC 2009 Adam Mitz <mitza@ociweb.com> + + * bin/ace_tests.lst: + * tests/non_mpc_makefile: + * tests/non_mpc_makefile/CustomMakefile: + * tests/non_mpc_makefile/foo.cpp: + * tests/non_mpc_makefile/run_test.pl: + + Added a test for non-MPC-generated Makefile compatibility with + the files in include/makeinclude. + Thu Jun 25 13:26:13 UTC 2009 Steve Huston <shuston@riverace.com> * include/makeinclude/wrapper_macros.GNU: Restore pre-5.7 build diff --git a/ACE/bin/ace_tests.lst b/ACE/bin/ace_tests.lst index 340782ab47f..82705ce031a 100644 --- a/ACE/bin/ace_tests.lst +++ b/ACE/bin/ace_tests.lst @@ -16,3 +16,4 @@ protocols/tests/HTBP/ping/run_test.pl: !NO_UUID !nsk !LynxOS !ACE_FOR_TAO !VxWor protocols/tests/HTBP/Send_Recv_Tests/run_test.pl: !NO_UUID !nsk !LynxOS !ACE_FOR_TAO !VxWorks !LabVIEW_RT protocols/tests/HTBP/Send_Large_Msg/run_test.pl: !NO_UUID !nsk !LynxOS !ACE_FOR_TAO !VxWorks !LabVIEW_RT protocols/tests/HTBP/Reactor_Tests/run_test.pl: !NO_UUID !nsk !LynxOS !ACE_FOR_TAO !VxWorks !LabVIEW_RT +tests/non_mpc_makefile/run_test.pl diff --git a/ACE/tests/non_mpc_makefile/CustomMakefile b/ACE/tests/non_mpc_makefile/CustomMakefile new file mode 100644 index 00000000000..0024b298e25 --- /dev/null +++ b/ACE/tests/non_mpc_makefile/CustomMakefile @@ -0,0 +1,9 @@ +static_libs_only=1 +LIB = libfoo.a +LSRC = foo.cpp +include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU +include $(ACE_ROOT)/include/makeinclude/macros.GNU +include $(ACE_ROOT)/include/makeinclude/rules.common.GNU +include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU +include $(ACE_ROOT)/include/makeinclude/rules.lib.GNU +include $(ACE_ROOT)/include/makeinclude/rules.local.GNU diff --git a/ACE/tests/non_mpc_makefile/foo.cpp b/ACE/tests/non_mpc_makefile/foo.cpp new file mode 100644 index 00000000000..b85b60d8746 --- /dev/null +++ b/ACE/tests/non_mpc_makefile/foo.cpp @@ -0,0 +1,4 @@ +int foo() +{ + return 42; +} diff --git a/ACE/tests/non_mpc_makefile/run_test.pl b/ACE/tests/non_mpc_makefile/run_test.pl new file mode 100755 index 00000000000..afb17fa5aec --- /dev/null +++ b/ACE/tests/non_mpc_makefile/run_test.pl @@ -0,0 +1,21 @@ +eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' + & eval 'exec perl -S $0 $argv:q' + if 0; + +# $Id$ +# -*- perl -*- + +use lib "$ENV{ACE_ROOT}/bin"; + +# This test can't run on Win32 +exit if ($^O eq 'MSWin32'); + +# This test can't be run if "make" is not in the path or if it resolves to +# a non-GNU version of make. + +exit unless (`make --version` =~ /^GNU Make/); + +print "Running non_mpc_makefile test:\n"; +system "make -f CustomMakefile"; +print "ERROR: libfoo.a not made\n" unless -r 'libfoo.a'; +system "make -f CustomMakefile realclean"; |