This is the mail archive of the
ecos-maintainers@sources.redhat.com
mailing list for the eCos project.
[APPROVE] cxxsupp test fixes
- From: Jonathan Larmour <jifl at eCosCentric dot com>
- To: eCos Maintainers <ecos-maintainers at sources dot redhat dot com>
- Date: Fri, 25 Apr 2003 20:59:01 +0100
- Subject: [APPROVE] cxxsupp test fixes
This is needed to prevent "make tests" failing when there's no kernel
and/or no malloc. Without it, it, er, doesn't work. There's no side-effects.
Okay?
Jifl
Index: ChangeLog
===================================================================
RCS file: /cvs/ecos/ecos/packages/infra/current/ChangeLog,v
retrieving revision 1.34
retrieving revision 1.36
diff -u -5 -p -r1.34 -r1.36
--- ChangeLog 11 Apr 2003 18:08:16 -0000 1.34
+++ ChangeLog 25 Apr 2003 19:56:34 -0000 1.36
@@ -1,5 +1,11 @@
+2003-04-25 Jonathan Larmour <jifl at eCosCentric dot com>
+
+ * tests/cxxsupp.cxx: don't include <pkgconf/kernel.h> as it's not
+ needed.
+ (cyg_start): CYGINT_ISO_MALLOC needs a #if test.
+
2003-04-10 Nick Garnett <nickg at balti dot calivar dot com>
* tests/cxxsupp.cxx: Added this test program to check that basic
C++ support is present. It checks that pure virtual functions can
be defined, that new and delete are present and functional, and
cvs server: src/PKGconf.mak no longer exists, no comparison available
cvs server: src/diag.c no longer exists, no comparison available
Index: tests/cxxsupp.cxx
===================================================================
RCS file: /cvs/ecos/ecos/packages/infra/current/tests/cxxsupp.cxx,v
retrieving revision 1.1
retrieving revision 1.3
diff -u -5 -p -r1.1 -r1.3
--- tests/cxxsupp.cxx 10 Apr 2003 18:08:36 -0000 1.1
+++ tests/cxxsupp.cxx 25 Apr 2003 19:56:34 -0000 1.3
@@ -46,11 +46,10 @@
// Description: Simple test for C++ runtime support.
//
//####DESCRIPTIONEND####
//==========================================================================
-#include <pkgconf/kernel.h>
#include <pkgconf/hal.h>
#include <pkgconf/isoinfra.h>
#include <cyg/infra/testcase.h>
#include <cyg/infra/diag.h>
@@ -137,11 +136,11 @@ cyg_start( void )
pure->pure_fun1();
pure->pure_fun2();
pure->impure_fun1();
pure->inline_fun1();
-#ifdef CYGINT_ISO_MALLOC
+#if CYGINT_ISO_MALLOC
Derived *derived2 = new Derived(2);
Pure *pure2 = derived2;
CYG_TEST_INFO("Calling derived2 members");
derived2->pure_fun1();
--
eCosCentric http://www.eCosCentric.com/ The eCos and RedBoot experts
--[ "You can complain because roses have thorns, or you ]--
--[ can rejoice because thorns have roses." -Lincoln ]-- Opinions==mine