Changeset 51ca358 in rtems


Ignore:
Timestamp:
05/10/04 16:02:11 (19 years ago)
Author:
Ralf Corsepius <ralf.corsepius@…>
Branches:
4.10, 4.11, 4.8, 4.9, 5, master
Children:
92166f37
Parents:
e12ba0e
Message:

2004-05-10 Ralf Corsepius <ralf_corsepius@…>

  • configure.ac: Add CXX-checks. New conditionals CXXTESTS, MPTESTS, NETTESTS. Add iostream/.
  • Makefile.am, base_mp/node1/Makefile.am, base_mp/node2/Makefile.am cdtest/Makefile.am, loopback/Makefile.am, pppd/Makefile.am: Reflect changes above.
  • cdtest/main.cc: Adaptation to new C++ standards.
Location:
testsuites/samples
Files:
9 edited

Legend:

Unmodified
Added
Removed

  • testsuites/samples/ChangeLog

    re12ba0e r51ca358  
     12004-05-10      Ralf Corsepius <ralf_corsepius@rtems.org>
     2
     3        * configure.ac: Add CXX-checks. New conditionals CXXTESTS, MPTESTS,
     4        NETTESTS. Add iostream/.
     5        * Makefile.am, base_mp/node1/Makefile.am, base_mp/node2/Makefile.am
     6        cdtest/Makefile.am, loopback/Makefile.am, pppd/Makefile.am:
     7        Reflect changes above.
     8        * cdtest/main.cc: Adaptation to new C++ standards.
     9
    1102004-05-10      Ralf Corsepius <ralf_corsepius@rtems.org>
    211

  • testsuites/samples/Makefile.am

    re12ba0e r51ca358  
    55ACLOCAL_AMFLAGS = -I ../aclocal
    66
    7 CPLUSPLUS_TESTS = cdtest
     7SUBDIRS = hello ticker base_sp unlimited minimum fileio
    88
     9if MPTESTS
    910## base_mp is a sample multiprocessing test
    10 MP_TESTS = base_mp
     11SUBDIRS += base_mp
     12endif
    1113
    12 FP_TESTS = paranoia
     14SUBDIRS += paranoia
    1315
     16if CXXTESTS
     17SUBDIRS += iostream cdtest
     18endif
     19
     20if NETTESTS
    1421## loopback tests a network loopback interface
    15 NET_TESTS = loopback
    16 NET_TESTS += pppd
     22SUBDIRS += loopback
     23SUBDIRS += pppd
     24endif
    1725
    18 SUBDIRS = hello ticker base_sp unlimited minimum fileio $(MP_TESTS) \
    19     $(CPLUSPLUS_TESTS) $(FP_TESTS) $(NET_TESTS)
    20 
    21 AUTOMAKE_FILES = sample.am
    22 
    23 EXTRA_DIST = $(AUTOMAKE_FILES)
     26DIST_SUBDIRS = hello ticker base_sp unlimited minimum fileio base_mp cdtest \
     27    paranoia loopback pppd
    2428
    2529include $(top_srcdir)/../automake/subdirs.am

  • testsuites/samples/base_mp/node1/Makefile.am

    re12ba0e r51ca358  
    3232AM_CPPFLAGS += -DNODE_NUMBER=$(NODE) -I.
    3333
    34 if HAS_MP
    35 
    3634#
    3735# (OPTIONAL) Add local stuff here using +=
    … …  
    4240
    4341all-local: $(TMPINSTALL_FILES)
    44 else
    45 all-local:
    46 endif
    4742
    4843EXTRA_DIST = $(DOCS)

  • testsuites/samples/base_mp/node2/Makefile.am

    re12ba0e r51ca358  
    3232AM_CPPFLAGS += -DNODE_NUMBER=$(NODE) -I.
    3333
    34 if HAS_MP
    35 
    3634#
    3735# (OPTIONAL) Add local stuff here using +=
    … …  
    4240
    4341all-local: $(TMPINSTALL_FILES)
    44 else
    45 all-local:
    46 endif
    4742
    4843EXTRA_DIST = $(DOCS)

  • testsuites/samples/cdtest/Makefile.am

    re12ba0e r51ca358  
    3030include $(top_srcdir)/sample.am
    3131
     32# AM_CPPFLAGS += -DRTEMS_TEST_IO_STREAM
     33
    3234#
    3335# (OPTIONAL) Add local stuff here using +=
    3436#
    3537
    36 if HAS_CXX
    3738${PGM}: $(OBJS) $(LINK_FILES)
    3839        $(make-cxx-exe)
    3940
    4041all-local: $(TMPINSTALL_FILES)
    41 else
    42 all-local:
    43 endif
    4442
    4543EXTRA_DIST = $(C_FILES) $(CC_FILES) $(DOCS)

  • testsuites/samples/cdtest/main.cc

    re12ba0e r51ca358  
    2727
    2828#include <rtems.h>
    29 #include <stdio.h>
    30 #include <stdlib.h>
     29
     30#include <cstdio>
     31#include <cstdlib>
     32
    3133#ifdef RTEMS_TEST_IO_STREAM
    32 #include <iostream.h>
     34#include <iostream>
    3335#endif
    3436
    … …  
    145147
    146148#ifdef RTEMS_TEST_IO_STREAM
    147     cout << "Testing a C++ I/O stream" << endl;
     149    std::cout << "Testing a C++ I/O stream" << std::endl;
    148150#else
    149151    printf("IO Stream not tested\n");

  • testsuites/samples/configure.ac

    re12ba0e r51ca358  
    2424
    2525RTEMS_PROG_CXX_FOR_TARGET
    26 
    2726RTEMS_CANONICALIZE_TOOLS
    2827
    … …  
    3231RTEMS_CHECK_NETWORKING
    3332
    34 AM_CONDITIONAL(HAS_NETWORKING,test "$HAS_NETWORKING" = "yes")
    35 AM_CONDITIONAL(HAS_CXX,test "$HAS_CPLUSPLUS" = "yes")
    36 AM_CONDITIONAL(HAS_MP,test "$HAS_MP" = "yes")
     33
     34CXXTESTS=$HAS_CPLUSPLUS
     35AS_IF([test $HAS_CPLUSPLUS = yes],[
     36  AC_LANG_PUSH([C++])
     37  AC_CHECK_HEADERS([cstdio cstdlib iostream],[],[CXXTESTS=no])
     38  AC_CACHE_CHECK(
     39  [if iostream supports std:: namespace],
     40  [rtems_cv_HAVE_IOSTREAM_STD_NAMESPACE],
     41  [AC_COMPILE_IFELSE(
     42    [AC_LANG_PROGRAM(
     43      [[#include <iostream>]],
     44      [[std::cout << "hello" << std::endl;]])
     45    ],
     46    [rtems_cv_HAVE_IOSTREAM_STD_NAMESPACE=yes],
     47    [rtems_cv_HAVE_IOSTREAM_STD_NAMESPACE=no])
     48  ])
     49  AS_IF([test $rtems_cv_HAVE_IOSTREAM_STD_NAMESPACE = no],[CXXTESTS=no])
     50  AS_IF([test $CXXTESTS = no],[
     51    AC_MSG_WARN([disabling C++ tests])
     52  ])
     53  AC_LANG_POP
     54])
     55
     56AM_CONDITIONAL([CXXTESTS],[test $CXXTESTS = "yes"])
     57AM_CONDITIONAL(NETTESTS,test "$HAS_NETWORKING" = "yes")
     58AM_CONDITIONAL(MPTESTS,test "$HAS_MP" = "yes")
     59
    3760#FIXME: We should use a feature based check
    3861AM_CONDITIONAL(LIBCHIP,[test "$RTEMS_BSP_FAMILY" != "posix"])
    … …  
    5174base_mp/node1/Makefile
    5275base_mp/node2/Makefile
     76iostream/Makefile
    5377cdtest/Makefile
    5478pppd/Makefile

  • testsuites/samples/loopback/Makefile.am

    re12ba0e r51ca358  
    2828#
    2929
    30 if HAS_NETWORKING
    3130all-local: $(TMPINSTALL_FILES)
    3231
    3332${PGM}: $(OBJS) $(LINK_FILES)
    3433        $(make-exe)
    35 endif
    3634
    3735EXTRA_DIST = $(C_FILES) $(DOCS)

  • testsuites/samples/pppd/Makefile.am

    re12ba0e r51ca358  
    2727#
    2828
    29 if HAS_NETWORKING
    3029all-local: $(TMPINSTALL_FILES)
    3130
    3231${PGM}: $(OBJS) $(LINK_FILES)
    3332        $(make-exe)
    34 endif
    3533
    3634EXTRA_DIST = $(C_FILES) $(H_FILES)
Note: See TracChangeset for help on using the changeset viewer.