diff options
Diffstat (limited to '')
40 files changed, 145 insertions, 38 deletions
diff --git a/testsuites/aclocal/check-cpuopts.m4 b/testsuites/aclocal/check-cpuopts.m4 index 5f5d94c892..e399f13cb2 100644 --- a/testsuites/aclocal/check-cpuopts.m4 +++ b/testsuites/aclocal/check-cpuopts.m4 @@ -2,18 +2,14 @@ # RTEMS_CHECK_CPUOPTS(define) AC_DEFUN([RTEMS_CHECK_CPUOPTS], [ +AC_REQUIRE([RTEMS_BUILD_TOP]) sav_CPPFLAGS="$CPPFLAGS" -AS_IF([test "${enable_cpukit_root+set}" = set],[ - CPPFLAGS="$CPPFLAGS -I$cpukit_rootdir/lib/include" -]) -AS_IF([test "${enable_project_root+set}" = set],[ - CPPFLAGS="$CPPFLAGS -I$project_rootdir/lib/include" -]) +CPPFLAGS="$CPPFLAGS -I${RTEMS_BUILD_ROOT}/include" AC_CACHE_CHECK( [for $1], [rtems_cv_$1], [AC_COMPILE_IFELSE([AC_LANG_SOURCE([ -#include <rtems/system.h> +#include <rtems/score/cpuopts.h> #ifndef $1 choke me #endif diff --git a/testsuites/aclocal/prog-cc.m4 b/testsuites/aclocal/prog-cc.m4 index c57008b1e9..748c76b39d 100644 --- a/testsuites/aclocal/prog-cc.m4 +++ b/testsuites/aclocal/prog-cc.m4 @@ -25,10 +25,11 @@ dnl check target cc RTEMS_PROG_CC AS_IF([test x"$GCC" = xyes],[ -AS_IF([test "${enable_cpukit_root+set}"],[ - GCCSPECS="-B\$(CPUKIT_ROOT)/lib/"]) -AS_IF([test "${enable_project_root+set}"],[ - GCCSPECS="$GCCSPECS -B\$(PROJECT_ROOT)/lib/"]) +GCCSPECS="-B\$(RTEMS_SOURCE_ROOT)/c/src/lib/libbsp/\$(RTEMS_CPU)/\$(RTEMS_BSP_FAMILY)/startup/" GCCSPECS="${GCCSPECS} -specs bsp_specs -qrtems"]) AC_SUBST(GCCSPECS) + +RTEMS_INCLUDES +RTEMS_BSP_INCLUDES +RTEMS_BSP_LINKCMDS ]) diff --git a/testsuites/aclocal/rtems-bsp-includes.m4 b/testsuites/aclocal/rtems-bsp-includes.m4 new file mode 100644 index 0000000000..2248211192 --- /dev/null +++ b/testsuites/aclocal/rtems-bsp-includes.m4 @@ -0,0 +1,13 @@ +dnl +dnl RTEMS Include paths. +dnl +AC_DEFUN([RTEMS_BSP_INCLUDES], +[ +AC_REQUIRE([RTEMS_SOURCE_TOP]) +AC_REQUIRE([RTEMS_BUILD_TOP]) +RTEMS_BSP_CPPFLAGS="-I${RTEMS_BUILD_ROOT}/lib/libbsp/\$(RTEMS_CPU)/\$(RTEMS_BSP_FAMILY)/include \ +-I${RTEMS_SOURCE_ROOT}/bsps/include \ +-I${RTEMS_SOURCE_ROOT}/bsps/\$(RTEMS_CPU)/include \ +-I${RTEMS_SOURCE_ROOT}/bsps/\$(RTEMS_CPU)/\$(RTEMS_BSP_FAMILY)/include" +AC_SUBST([RTEMS_BSP_CPPFLAGS]) +]) diff --git a/testsuites/aclocal/rtems-bsp-linkcmds.m4 b/testsuites/aclocal/rtems-bsp-linkcmds.m4 new file mode 100644 index 0000000000..a4137e18de --- /dev/null +++ b/testsuites/aclocal/rtems-bsp-linkcmds.m4 @@ -0,0 +1,25 @@ +dnl +dnl RTEMS Include paths. +dnl +dnl This is messy because the linkcmds have no clear and defined structure. +dnl There are BSP named linkcmds files, plain linkcmds file, configure template +dnl .in files configure changes and shared versions of these. The approach to have +dnl a single file for a number of BSPs in a family is sound, the lack of rules +dnl means we have a range of variants and this results in following code. +dnl +dnl The preinstall hid a number of questionable things and preinstall has gone. +dnl +AC_DEFUN([RTEMS_BSP_LINKCMDS], +[ +AC_REQUIRE([RTEMS_SOURCE_TOP]) +AC_REQUIRE([RTEMS_BUILD_TOP]) + +AC_MSG_CHECKING([BSP linkcmds]) + +RTEMS_BSP_ARCH_PATH="${RTEMS_SOURCE_ROOT}/c/src/lib/libbsp/${RTEMS_CPU}" +RTEMS_BSP_ARCH_LINKCMDS_PATH="${RTEMS_BSP_ARCH_PATH}/shared/startup" +RTEMS_BSP_LIBBSP_PATH="${RTEMS_BUILD_ROOT}/lib/libbsp/${RTEMS_CPU}/${RTEMS_BSP_FAMILY}" + +AC_SUBST(RTEMS_BSP_ARCH_LINKCMDS_PATH) +AC_SUBST(RTEMS_BSP_LIBBSP_PATH) +]) diff --git a/testsuites/aclocal/rtems-build-top.m4 b/testsuites/aclocal/rtems-build-top.m4 new file mode 100644 index 0000000000..5708119c14 --- /dev/null +++ b/testsuites/aclocal/rtems-build-top.m4 @@ -0,0 +1,12 @@ +dnl +dnl RTEMS_BUILD_TOP($1) +dnl +AC_DEFUN([RTEMS_BUILD_TOP], +[dnl +# +# This is a copy of the horrible hack in rtems-top.m4 and it is simpler to +# copy it that attempt to clean this crap up. +# +RTEMS_BUILD_ROOT="${with_rtems_build_top}" +AC_SUBST([RTEMS_BUILD_ROOT]) +])dnl diff --git a/testsuites/aclocal/rtems-includes.m4 b/testsuites/aclocal/rtems-includes.m4 new file mode 100644 index 0000000000..ca4ebed581 --- /dev/null +++ b/testsuites/aclocal/rtems-includes.m4 @@ -0,0 +1,23 @@ +dnl +dnl RTEMS Include paths. +dnl +AC_DEFUN([RTEMS_INCLUDES], +[ +AC_REQUIRE([RTEMS_SOURCE_TOP]) +AC_REQUIRE([RTEMS_BUILD_TOP]) + +# Was CFLAGS set? +rtems_cv_CFLAGS_set="${CFLAGS+set}" + +RTEMS_INCLUDE_CPUKIT="-I${RTEMS_SOURCE_ROOT}/cpukit/include" +RTEMS_INCLUDE_CPUKIT_ARCH="-I${RTEMS_SOURCE_ROOT}/cpukit/score/cpu/\$(RTEMS_CPU)/include" + +RTEMS_CPUKIT_INCLUDE="${RTEMS_INCLUDE_CPUKIT} ${RTEMS_INCLUDE_CPUKIT_ARCH}" +RTEMS_BUILD_INCLUDE="-I\$(top_builddir) -I${RTEMS_BUILD_ROOT}/include" + +RTEMS_INCLUDE="${RTEMS_BUILD_INCLUDE} ${RTEMS_CPUKIT_INCLUDE}" + +RTEMS_CPPFLAGS="${RTEMS_INCLUDE}" + +AC_SUBST([RTEMS_CPPFLAGS]) +]) diff --git a/testsuites/aclocal/rtems-source-top.m4 b/testsuites/aclocal/rtems-source-top.m4 new file mode 100644 index 0000000000..d1460ae82d --- /dev/null +++ b/testsuites/aclocal/rtems-source-top.m4 @@ -0,0 +1,8 @@ +dnl +dnl RTEMS_SOURCE_TOP +dnl +AC_DEFUN([RTEMS_SOURCE_TOP], +[dnl +RTEMS_SOURCE_ROOT="${with_rtems_source_top}" +AC_SUBST([RTEMS_SOURCE_ROOT]) +])dnl diff --git a/testsuites/ada/ada.am b/testsuites/ada/ada.am index 17084fb753..33d0c3ae2f 100644 --- a/testsuites/ada/ada.am +++ b/testsuites/ada/ada.am @@ -2,18 +2,14 @@ SUFFIXES = .adb .ali .ads .adp GNATMAKE = @GNATMAKE@ -AM_ADAFLAGS = -I$(PROJECT_ROOT)/lib/include/adainclude \ --I$(PROJECT_ROOT)/@RTEMS_BSP@/lib/include/adainclude \ +AM_ADAFLAGS = -I$(RTEMS_SOURCE_ROOT)/cpukit/include/adainclude \ -I$(top_srcdir)/support GNATCOMPILE = $(GNATMAKE) \ -bargs -Mgnat_main \ -margs $(AM_ADAFLAGS) $(ADAFLAGS) \ -cargs $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) \ - $(GCCSPECS) \ --largs $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) \ - $(GCCSPECS) \ -$(AM_LDFLAGS) $(LDFLAGS) init.o +-largs $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) init.o CLEANFILES += *.ali *.o b~*.adb b~*.ads diff --git a/testsuites/ada/configure.ac b/testsuites/ada/configure.ac index a9293842b9..4ec8532ada 100644 --- a/testsuites/ada/configure.ac +++ b/testsuites/ada/configure.ac @@ -4,6 +4,8 @@ AC_PREREQ([2.69]) AC_INIT([rtems-ada-tests],[_RTEMS_VERSION],[https://devel.rtems.org/newticket]) AC_CONFIG_SRCDIR([support]) RTEMS_TOP([../..],[..]) +RTEMS_SOURCE_TOP +RTEMS_BUILD_TOP RTEMS_CANONICAL_TARGET_CPU diff --git a/testsuites/ada/samples/base_mp/node1/Makefile.am b/testsuites/ada/samples/base_mp/node1/Makefile.am index c6ec8cd42b..f9e45cfde3 100644 --- a/testsuites/ada/samples/base_mp/node1/Makefile.am +++ b/testsuites/ada/samples/base_mp/node1/Makefile.am @@ -14,7 +14,7 @@ ada_base_mp_node1$(EXEEXT): ../mptest.adb init.o $(GNATCOMPILE) -margs -a $< -o $@ init.o: ../../../support/init.c - $(COMPILE.c) -DNODE_NUMBER=1 -I$(srcdir)/.. -c $< + $(COMPILE.c) $(AM_CPPFLAGS) -DNODE_NUMBER=1 -I$(srcdir)/.. -c $< scndir = $(rtems_ada_testsdir) dist_scn_DATA = ada_base_mp-node1.scn diff --git a/testsuites/ada/samples/base_mp/node2/Makefile.am b/testsuites/ada/samples/base_mp/node2/Makefile.am index 9095902a0b..6567b95976 100644 --- a/testsuites/ada/samples/base_mp/node2/Makefile.am +++ b/testsuites/ada/samples/base_mp/node2/Makefile.am @@ -14,7 +14,7 @@ ada_base_mp_node2$(EXEEXT): ../mptest.adb init.o $(GNATCOMPILE) -margs -a $< -o $@ init.o: ../../../support/init.c - $(COMPILE.c) -DNODE_NUMBER=2 -I$(srcdir)/.. -c $< + $(COMPILE.c) $(AM_CPPFLAGS) -DNODE_NUMBER=2 -I$(srcdir)/.. -c $< scndir = $(rtems_ada_testsdir) dist_scn_DATA = ada_base_mp-node2.scn diff --git a/testsuites/ada/samples/base_sp/Makefile.am b/testsuites/ada/samples/base_sp/Makefile.am index c6b2628735..97ed434c91 100644 --- a/testsuites/ada/samples/base_sp/Makefile.am +++ b/testsuites/ada/samples/base_sp/Makefile.am @@ -7,7 +7,7 @@ ada_base_sp$(EXEEXT): base_sp.adb init.$(OBJEXT) $(GNATCOMPILE) -margs -a $< -o $@ init.$(OBJEXT): ../../support/init.c - $(COMPILE.c) -I$(srcdir) -c $< + $(COMPILE.c) $(AM_CPPFLAGS) -I$(srcdir) -c $< noinst_PROGRAMS = ada_base_sp diff --git a/testsuites/ada/samples/hello/Makefile.am b/testsuites/ada/samples/hello/Makefile.am index 9a6aa5eeb6..ccf8ccf37a 100644 --- a/testsuites/ada/samples/hello/Makefile.am +++ b/testsuites/ada/samples/hello/Makefile.am @@ -7,7 +7,7 @@ ada_hello$(EXEEXT): hello.adb init.$(OBJEXT) $(GNATCOMPILE) -margs -a $< -o $@ init.$(OBJEXT): ../../support/init.c - $(COMPILE.c) -I$(srcdir) -c $< + $(COMPILE.c) $(AM_CPPFLAGS) -I$(srcdir) -c $< noinst_PROGRAMS = ada_hello diff --git a/testsuites/ada/samples/nsecs/Makefile.am b/testsuites/ada/samples/nsecs/Makefile.am index 64a8145818..e0b0849a14 100644 --- a/testsuites/ada/samples/nsecs/Makefile.am +++ b/testsuites/ada/samples/nsecs/Makefile.am @@ -7,7 +7,7 @@ ada_nsecs$(EXEEXT): nsecs.adb init.$(OBJEXT) $(GNATCOMPILE) -margs -a $< -o $@ init.$(OBJEXT): ../../support/init.c - $(COMPILE.c) -I$(srcdir) -c $< + $(COMPILE.c) $(AM_CPPFLAGS) -I$(srcdir) -c $< noinst_PROGRAMS = ada_nsecs diff --git a/testsuites/ada/samples/ticker/Makefile.am b/testsuites/ada/samples/ticker/Makefile.am index 12594586b3..de5050e79b 100644 --- a/testsuites/ada/samples/ticker/Makefile.am +++ b/testsuites/ada/samples/ticker/Makefile.am @@ -7,7 +7,7 @@ ada_ticker$(EXEEXT): ticker.adb init.$(OBJEXT) $(GNATCOMPILE) -margs -a $< -o $@ init.$(OBJEXT): ../../support/init.c - $(COMPILE.c) -I$(srcdir) -c $< + $(COMPILE.c) $(AM_CPPFLAGS) -I$(srcdir) -c $< noinst_PROGRAMS = ada_ticker diff --git a/testsuites/ada/sptests/spname01/Makefile.am b/testsuites/ada/sptests/spname01/Makefile.am index fccab37289..e011a95b79 100644 --- a/testsuites/ada/sptests/spname01/Makefile.am +++ b/testsuites/ada/sptests/spname01/Makefile.am @@ -10,7 +10,7 @@ ada_spname01$(EXEEXT): spname01.adb init.$(OBJEXT) $(GNATCOMPILE) -margs -a $< -o $@ init.$(OBJEXT): ../../support/init.c - $(COMPILE.c) -I$(srcdir) -c $< + $(COMPILE.c) $(AM_CPPFLAGS) -I$(srcdir) -c $< scndir = $(rtems_ada_testsdir) dist_scn_DATA = ada_spname01.scn diff --git a/testsuites/automake/compile.am b/testsuites/automake/compile.am index ee1f77381a..3cd08c4b9e 100644 --- a/testsuites/automake/compile.am +++ b/testsuites/automake/compile.am @@ -1,6 +1,6 @@ -CC = @CC@ $(GCCSPECS) -CXX = @CXX@ $(GCCSPECS) -CPP = @CPP@ $(GCCSPECS) +CC = @CC@ +CXX = @CXX@ +CPP = @CPP@ LD = @LD@ OBJCOPY = @OBJCOPY@ @@ -9,9 +9,12 @@ SIZE = @SIZE@ STRIP = @STRIP@ ## -AM_CPPFLAGS = $(TEST_FLAGS) +AM_CPPFLAGS = $(TEST_FLAGS) @RTEMS_CPPFLAGS@ @RTEMS_BSP_CPPFLAGS@ AM_CFLAGS = $(TEST_C_FLAGS) AM_CXXFLAGS = $(TEST_CXX_FLAGS) -AM_LDFLAGS = $(TEST_LD_FLAGS) +AM_LDFLAGS = -B$(RTEMS_BSP_LIBBSP_PATH) $(GCCSPECS) \ + -L$(PROJECT_LIB) \ + -L$(RTEMS_BSP_ARCH_LINKCMDS_PATH) \ + $(TEST_LD_FLAGS) CLEANFILES = *.num *.nxe *.elf *.srec* *.bin *.bt *.ralf diff --git a/testsuites/automake/host.am b/testsuites/automake/host.am index c25c0526a4..2f0beadd89 100644 --- a/testsuites/automake/host.am +++ b/testsuites/automake/host.am @@ -3,6 +3,3 @@ ## Once automake is fully integrated these make targets ## and this file will probably be removed -preinstall-am: $(PREINSTALL_FILES) -preinstall: preinstall-am -.PHONY: preinstall preinstall-am diff --git a/testsuites/automake/local.am b/testsuites/automake/local.am index 31299028d6..b87fd89810 100644 --- a/testsuites/automake/local.am +++ b/testsuites/automake/local.am @@ -1,6 +1,5 @@ -preinstall: -.PHONY: preinstall - PROJECT_TOOLS = $(PROJECT_RELEASE)/build-tools TEST_LD_FLAGS = -Wl,--wrap=printf -Wl,--wrap=puts -Wl,--wrap=putchar + +all-local: $(TMPINSTALL_FILES) diff --git a/testsuites/benchmarks/configure.ac b/testsuites/benchmarks/configure.ac index f28fc79162..a9dbefccc8 100644 --- a/testsuites/benchmarks/configure.ac +++ b/testsuites/benchmarks/configure.ac @@ -4,6 +4,8 @@ AC_PREREQ([2.69]) AC_INIT([rtems-c-src-tests-benchmarks],[_RTEMS_VERSION],[https://devel.rtems.org/newticket]) AC_CONFIG_HEADER([config.h]) RTEMS_TOP([../..],[..]) +RTEMS_SOURCE_TOP +RTEMS_BUILD_TOP RTEMS_CANONICAL_TARGET_CPU diff --git a/testsuites/configure.ac b/testsuites/configure.ac index ae01a97079..a01bc43130 100644 --- a/testsuites/configure.ac +++ b/testsuites/configure.ac @@ -4,6 +4,8 @@ AC_PREREQ([2.69]) AC_INIT([rtems-c-src-tests],[_RTEMS_VERSION],[https://devel.rtems.org/newticket]) AC_CONFIG_SRCDIR([PROBLEMS]) RTEMS_TOP([..],[]) +RTEMS_SOURCE_TOP +RTEMS_BUILD_TOP RTEMS_CANONICAL_TARGET_CPU diff --git a/testsuites/fstests/configure.ac b/testsuites/fstests/configure.ac index 37a92bbca5..9b4a299e80 100644 --- a/testsuites/fstests/configure.ac +++ b/testsuites/fstests/configure.ac @@ -5,6 +5,8 @@ AC_INIT([rtems-c-src-tests-fstests], [_RTEMS_VERSION],[https://devel.rtems.org/newticket]) AC_CONFIG_SRCDIR([imfs_support]) RTEMS_TOP([../..],[..]) +RTEMS_SOURCE_TOP +RTEMS_BUILD_TOP RTEMS_CANONICAL_TARGET_CPU diff --git a/testsuites/libtests/POSIX/Makefile.am b/testsuites/libtests/POSIX/Makefile.am index 1f806513cf..689fd391e6 100644 --- a/testsuites/libtests/POSIX/Makefile.am +++ b/testsuites/libtests/POSIX/Makefile.am @@ -1,4 +1,4 @@ -CC = @CC@ $(GCCSPECS) +CC = @CC@ check_PROGRAMS = diff --git a/testsuites/libtests/configure.ac b/testsuites/libtests/configure.ac index 16cc095991..dc4602cbb2 100644 --- a/testsuites/libtests/configure.ac +++ b/testsuites/libtests/configure.ac @@ -5,6 +5,8 @@ AC_INIT([rtems-c-src-tests-libtests],[_RTEMS_VERSION],[https://devel.rtems.org/n AC_CONFIG_SRCDIR([cpuuse]) AC_CONFIG_HEADER([config.h]) RTEMS_TOP([../..],[..]) +RTEMS_SOURCE_TOP +RTEMS_BUILD_TOP RTEMS_CANONICAL_TARGET_CPU diff --git a/testsuites/libtests/ftp01/Makefile.am b/testsuites/libtests/ftp01/Makefile.am index a3b8f3e2b4..4a0fd4efe6 100644 --- a/testsuites/libtests/ftp01/Makefile.am +++ b/testsuites/libtests/ftp01/Makefile.am @@ -11,7 +11,7 @@ include $(top_srcdir)/../automake/compile.am include $(top_srcdir)/../automake/leaf.am AM_CPPFLAGS += -I$(top_srcdir)/../support/include -AM_CPPFLAGS += -I$(top_srcdir)/termios04 +AM_CPPFLAGS += -I$(RTEMS_SOURCE_ROOT)/cpukit/libnetworking LINK_OBJS = $(ftp01_OBJECTS) $(ftp01_LDADD) LINK_LIBS = $(ftp01_LDLIBS) diff --git a/testsuites/libtests/mghttpd01/Makefile.am b/testsuites/libtests/mghttpd01/Makefile.am index 909a646970..d3c89d86ca 100644 --- a/testsuites/libtests/mghttpd01/Makefile.am +++ b/testsuites/libtests/mghttpd01/Makefile.am @@ -12,6 +12,7 @@ include $(top_srcdir)/../automake/compile.am include $(top_srcdir)/../automake/leaf.am AM_CPPFLAGS += -I$(top_srcdir)/../support/include +AM_CPPFLAGS += -I$(RTEMS_SOURCE_ROOT)/cpukit/libnetworking LINK_OBJS = $(mghttpd01_OBJECTS) $(mghttpd01_LDADD) LINK_LIBS = $(mghttpd01_LDLIBS) diff --git a/testsuites/libtests/networking01/Makefile.am b/testsuites/libtests/networking01/Makefile.am index 0f1fb70bd3..3bc93cebd7 100644 --- a/testsuites/libtests/networking01/Makefile.am +++ b/testsuites/libtests/networking01/Makefile.am @@ -10,7 +10,7 @@ include $(top_srcdir)/../automake/compile.am include $(top_srcdir)/../automake/leaf.am AM_CPPFLAGS += -I$(top_srcdir)/../support/include -AM_CPPFLAGS += -I$(top_srcdir)/termios04 +AM_CPPFLAGS += -I$(RTEMS_SOURCE_ROOT)/cpukit/libnetworking LINK_OBJS = $(networking01_OBJECTS) LINK_LIBS = $(networking01_LDLIBS) diff --git a/testsuites/libtests/syscall01/Makefile.am b/testsuites/libtests/syscall01/Makefile.am index 126cd30aa7..6d8038e20b 100644 --- a/testsuites/libtests/syscall01/Makefile.am +++ b/testsuites/libtests/syscall01/Makefile.am @@ -8,6 +8,7 @@ include $(top_srcdir)/../automake/compile.am include $(top_srcdir)/../automake/leaf.am AM_CPPFLAGS += -I$(top_srcdir)/../support/include +AM_CPPFLAGS += -I$(RTEMS_SOURCE_ROOT)/cpukit/libnetworking LINK_OBJS = $(syscall01_OBJECTS) LINK_LIBS = $(syscall01_LDLIBS) diff --git a/testsuites/mptests/configure.ac b/testsuites/mptests/configure.ac index f01cfc1c94..fca89117a1 100644 --- a/testsuites/mptests/configure.ac +++ b/testsuites/mptests/configure.ac @@ -5,6 +5,8 @@ AC_INIT([rtems-c-src-tests-mptests],[_RTEMS_VERSION],[https://devel.rtems.org/ne AC_CONFIG_SRCDIR([mp01]) AC_CONFIG_HEADER([config.h]) RTEMS_TOP([../..],[..]) +RTEMS_SOURCE_TOP +RTEMS_BUILD_TOP RTEMS_CANONICAL_TARGET_CPU diff --git a/testsuites/psxtests/configure.ac b/testsuites/psxtests/configure.ac index 7243bfdbb5..e84d92c0cc 100644 --- a/testsuites/psxtests/configure.ac +++ b/testsuites/psxtests/configure.ac @@ -5,6 +5,8 @@ AC_INIT([rtems-c-src-tests-psxtests],[_RTEMS_VERSION],[https://devel.rtems.org/n AC_CONFIG_SRCDIR([psx01]) AC_CONFIG_HEADER([config.h]) RTEMS_TOP([../..],[..]) +RTEMS_SOURCE_TOP +RTEMS_BUILD_TOP RTEMS_CANONICAL_TARGET_CPU diff --git a/testsuites/psxtmtests/configure.ac b/testsuites/psxtmtests/configure.ac index b3ab540951..becaa2e03a 100644 --- a/testsuites/psxtmtests/configure.ac +++ b/testsuites/psxtmtests/configure.ac @@ -4,6 +4,8 @@ AC_PREREQ([2.69]) AC_INIT([rtems-c-src-tests-psxtmtests],[_RTEMS_VERSION],[https://devel.rtems.org/newticket]) AC_CONFIG_SRCDIR([psxtmmutex02]) RTEMS_TOP([../..],[..]) +RTEMS_SOURCE_TOP +RTEMS_BUILD_TOP RTEMS_CANONICAL_TARGET_CPU diff --git a/testsuites/rhealstone/configure.ac b/testsuites/rhealstone/configure.ac index af35f6819d..9319c28a5c 100644 --- a/testsuites/rhealstone/configure.ac +++ b/testsuites/rhealstone/configure.ac @@ -5,6 +5,8 @@ AC_INIT([rtems-c-src-tests-rhealstone],[_RTEMS_VERSION],[https://devel.rtems.org AC_CONFIG_SRCDIR([rhtaskswitch]) AC_CONFIG_HEADER([config.h]) RTEMS_TOP([../..],[..]) +RTEMS_SOURCE_TOP +RTEMS_BUILD_TOP RTEMS_CANONICAL_TARGET_CPU diff --git a/testsuites/samples/configure.ac b/testsuites/samples/configure.ac index ffe1bad2c2..88e868feaf 100644 --- a/testsuites/samples/configure.ac +++ b/testsuites/samples/configure.ac @@ -5,6 +5,8 @@ AC_INIT([rtems-c-src-tests-samples],[_RTEMS_VERSION],[https://devel.rtems.org/ne AC_CONFIG_SRCDIR([hello]) AC_CONFIG_HEADER([config.h]) RTEMS_TOP([../..],[..]) +RTEMS_SOURCE_TOP +RTEMS_BUILD_TOP RTEMS_CANONICAL_TARGET_CPU diff --git a/testsuites/samples/loopback/Makefile.am b/testsuites/samples/loopback/Makefile.am index d0cebb989f..51d30c2b33 100644 --- a/testsuites/samples/loopback/Makefile.am +++ b/testsuites/samples/loopback/Makefile.am @@ -9,6 +9,7 @@ include $(top_srcdir)/../automake/compile.am include $(top_srcdir)/../automake/leaf.am AM_CPPFLAGS += -I$(top_srcdir)/../support/include +AM_CPPFLAGS += -I$(RTEMS_SOURCE_ROOT)/cpukit/libnetworking LINK_OBJS = $(loopback_OBJECTS) LINK_LIBS = $(loopback_LDLIBS) diff --git a/testsuites/samples/pppd/Makefile.am b/testsuites/samples/pppd/Makefile.am index 6a989f8c51..6ef0562362 100644 --- a/testsuites/samples/pppd/Makefile.am +++ b/testsuites/samples/pppd/Makefile.am @@ -10,6 +10,7 @@ include $(top_srcdir)/../automake/leaf.am pppd_LDLIBS = -lpppd AM_CPPFLAGS += -I$(top_srcdir)/../support/include +AM_CPPFLAGS += -I$(RTEMS_SOURCE_ROOT)/cpukit/libnetworking LINK_OBJS = $(pppd_OBJECTS) LINK_LIBS = $(pppd_LDLIBS) diff --git a/testsuites/smptests/configure.ac b/testsuites/smptests/configure.ac index d72f6e072d..78996b23ab 100644 --- a/testsuites/smptests/configure.ac +++ b/testsuites/smptests/configure.ac @@ -5,6 +5,8 @@ AC_INIT([rtems-c-src-tests-smptests],[_RTEMS_VERSION],[https://devel.rtems.org/n AC_CONFIG_SRCDIR([smp01]) AC_CONFIG_HEADER([config.h]) RTEMS_TOP([../..],[..]) +RTEMS_SOURCE_TOP +RTEMS_BUILD_TOP RTEMS_CANONICAL_TARGET_CPU diff --git a/testsuites/sptests/configure.ac b/testsuites/sptests/configure.ac index 6a303b25c5..2dcdb0cfa2 100644 --- a/testsuites/sptests/configure.ac +++ b/testsuites/sptests/configure.ac @@ -5,6 +5,8 @@ AC_INIT([rtems-c-src-tests-sptests],[_RTEMS_VERSION],[https://devel.rtems.org/ne AC_CONFIG_SRCDIR([sp01]) AC_CONFIG_HEADER([config.h]) RTEMS_TOP([../..],[..]) +RTEMS_SOURCE_TOP +RTEMS_BUILD_TOP RTEMS_CANONICAL_TARGET_CPU diff --git a/testsuites/tmtests/configure.ac b/testsuites/tmtests/configure.ac index b899000a3e..a5d8c3e182 100644 --- a/testsuites/tmtests/configure.ac +++ b/testsuites/tmtests/configure.ac @@ -5,6 +5,8 @@ AC_INIT([rtems-c-src-tests-tmtests],[_RTEMS_VERSION],[https://devel.rtems.org/ne AC_CONFIG_SRCDIR([tm01]) AC_CONFIG_HEADER([config.h]) RTEMS_TOP([../..],[..]) +RTEMS_SOURCE_TOP +RTEMS_BUILD_TOP RTEMS_CANONICAL_TARGET_CPU diff --git a/testsuites/tools/configure.ac b/testsuites/tools/configure.ac index 4249701488..5f559b80c9 100644 --- a/testsuites/tools/configure.ac +++ b/testsuites/tools/configure.ac @@ -4,6 +4,8 @@ AC_PREREQ([2.69]) AC_INIT([rtems-c-src-tests-tools],[_RTEMS_VERSION],[https://devel.rtems.org/newticket]) AC_CONFIG_SRCDIR([generic]) RTEMS_TOP([../..],[..]) +RTEMS_SOURCE_TOP +RTEMS_BUILD_TOP RTEMS_CANONICAL_TARGET_CPU diff --git a/testsuites/tools/generic/configure.ac b/testsuites/tools/generic/configure.ac index 73f1144e50..ffde158897 100644 --- a/testsuites/tools/generic/configure.ac +++ b/testsuites/tools/generic/configure.ac @@ -4,6 +4,8 @@ AC_PREREQ([2.69]) AC_INIT([rtems-c-src-tests-tools-generic],[_RTEMS_VERSION],[https://devel.rtems.org/newticket]) AC_CONFIG_SRCDIR([sorttimes.in]) RTEMS_TOP(../../..) +RTEMS_SOURCE_TOP +RTEMS_BUILD_TOP RTEMS_CANONICAL_TARGET_CPU |