Re: ARM build failing

[Sebastian Huber]

On 09/04/18 07:38, Chris Johns wrote:

I am not sure if we should omit BSPs which cannot cope with a --enable-* option.
If you want to build all BSPs you want to build all BSPs?


I think it would too hard at this point in time to probe and create a list of
those BSPs that support the options. I am thinking if you use --enable-smp or
--enable-multiprocessing you must provide a list of BSPs so the wildcard or all
default cannot be used. If a user supplies a BSP that is not support that is a
different issue and the need to handle that better for SMP would be nice.


Yes, this sounds good.

--
Sebastian Huber, embedded brains GmbH

Address : Dornierstr. 4, D-82178 Puchheim, Germany
Phone   : +49 89 189 47 41-16
Fax : +49 89 189 47 41-09
E-Mail  : sebastian.hu...@embedded-brains.de
PGP : Public key available on request.

Diese Nachricht ist keine geschäftliche Mitteilung im Sinne des EHUG.

___
devel mailing list
devel@rtems.org
http://lists.rtems.org/mailman/listinfo/devel

Re: ARM build failing

[Chris Johns]

On 09/04/2018 15:29, Sebastian Huber wrote:
> On 09/04/18 07:20, Chris Johns wrote:
>> On 09/04/2018 15:05, Sebastian Huber wrote:
>>> On 09/04/18 01:06, Chris Johns wrote:
 I am testing testsuite Makefile.am changes and the following configure:

 /opt/work/chris/rtems/kernel/rtems.git/configure
 --prefix=/opt/work/rtems/bsps/5
 --target=arm-rtems5 --enable-posix --enable-networking --enable-smp
 --enable-tests --enable-maintainer-mode

 fails with:

 gmake[5]: Entering directory
 '/opt/work/chris/rtems/kernel/bsps/arm/arm-rtems5/c/atsamv/cpukit/score'
>>> The --enable-smp doesn't work with this BSP.
>>>
>> Seems a brutal way to let a user know?
>>
>> Considering this is a little it means --enable-smp and 
>> --enable-multiprocessing
>> is broken when the BSP wildcard is used. Should we require a BSP or list of 
>> BSPs
>> be provided to configure? It would avoid this issue?
> 
> I think for the --enable-multiprocessing we already have something like this:
> 
> c/src/aclocal/check-multiprocessing.m4
> 

Yes.

> I am not sure if we should omit BSPs which cannot cope with a --enable-* 
> option.
> If you want to build all BSPs you want to build all BSPs?
> 

I think it would too hard at this point in time to probe and create a list of
those BSPs that support the options. I am thinking if you use --enable-smp or
--enable-multiprocessing you must provide a list of BSPs so the wildcard or all
default cannot be used. If a user supplies a BSP that is not support that is a
different issue and the need to handle that better for SMP would be nice.

Chris
___
devel mailing list
devel@rtems.org
http://lists.rtems.org/mailman/listinfo/devel

Re: ARM build failing

[Sebastian Huber]

On 09/04/18 07:20, Chris Johns wrote:

On 09/04/2018 15:05, Sebastian Huber wrote:

On 09/04/18 01:06, Chris Johns wrote:

I am testing testsuite Makefile.am changes and the following configure:

/opt/work/chris/rtems/kernel/rtems.git/configure --prefix=/opt/work/rtems/bsps/5
--target=arm-rtems5 --enable-posix --enable-networking --enable-smp
--enable-tests --enable-maintainer-mode

fails with:

gmake[5]: Entering directory
'/opt/work/chris/rtems/kernel/bsps/arm/arm-rtems5/c/atsamv/cpukit/score'

The --enable-smp doesn't work with this BSP.


Seems a brutal way to let a user know?

Considering this is a little it means --enable-smp and --enable-multiprocessing
is broken when the BSP wildcard is used. Should we require a BSP or list of BSPs
be provided to configure? It would avoid this issue?


I think for the --enable-multiprocessing we already have something like 
this:


c/src/aclocal/check-multiprocessing.m4

I am not sure if we should omit BSPs which cannot cope with a --enable-* 
option. If you want to build all BSPs you want to build all BSPs?


--
Sebastian Huber, embedded brains GmbH

Address : Dornierstr. 4, D-82178 Puchheim, Germany
Phone   : +49 89 189 47 41-16
Fax : +49 89 189 47 41-09
E-Mail  : sebastian.hu...@embedded-brains.de
PGP : Public key available on request.

Diese Nachricht ist keine geschäftliche Mitteilung im Sinne des EHUG.

___
devel mailing list
devel@rtems.org
http://lists.rtems.org/mailman/listinfo/devel

Re: ARM build failing

[Chris Johns]

On 09/04/2018 15:05, Sebastian Huber wrote:
> On 09/04/18 01:06, Chris Johns wrote:
>> I am testing testsuite Makefile.am changes and the following configure:
>>
>> /opt/work/chris/rtems/kernel/rtems.git/configure 
>> --prefix=/opt/work/rtems/bsps/5
>> --target=arm-rtems5 --enable-posix --enable-networking --enable-smp
>> --enable-tests --enable-maintainer-mode
>>
>> fails with:
>>
>> gmake[5]: Entering directory
>> '/opt/work/chris/rtems/kernel/bsps/arm/arm-rtems5/c/atsamv/cpukit/score'
> 
> The --enable-smp doesn't work with this BSP.
> 

Seems a brutal way to let a user know?

Considering this is a little it means --enable-smp and --enable-multiprocessing
is broken when the BSP wildcard is used. Should we require a BSP or list of BSPs
be provided to configure? It would avoid this issue?

Chris
___
devel mailing list
devel@rtems.org
http://lists.rtems.org/mailman/listinfo/devel

Re: ARM build failing

[Sebastian Huber]

On 09/04/18 01:06, Chris Johns wrote:

I am testing testsuite Makefile.am changes and the following configure:

/opt/work/chris/rtems/kernel/rtems.git/configure --prefix=/opt/work/rtems/bsps/5
--target=arm-rtems5 --enable-posix --enable-networking --enable-smp
--enable-tests --enable-maintainer-mode

fails with:

gmake[5]: Entering directory
'/opt/work/chris/rtems/kernel/bsps/arm/arm-rtems5/c/atsamv/cpukit/score'


The --enable-smp doesn't work with this BSP.

--
Sebastian Huber, embedded brains GmbH

Address : Dornierstr. 4, D-82178 Puchheim, Germany
Phone   : +49 89 189 47 41-16
Fax : +49 89 189 47 41-09
E-Mail  : sebastian.hu...@embedded-brains.de
PGP : Public key available on request.

Diese Nachricht ist keine geschäftliche Mitteilung im Sinne des EHUG.

___
devel mailing list
devel@rtems.org
http://lists.rtems.org/mailman/listinfo/devel

Re: tch to merge nested test group Makefile.am files

[Sebastian Huber]

Hello Chris,

thanks, this is a really nice build system clean up.

--
Sebastian Huber, embedded brains GmbH

Address : Dornierstr. 4, D-82178 Puchheim, Germany
Phone   : +49 89 189 47 41-16
Fax : +49 89 189 47 41-09
E-Mail  : sebastian.hu...@embedded-brains.de
PGP : Public key available on request.

Diese Nachricht ist keine geschäftliche Mitteilung im Sinne des EHUG.

___
devel mailing list
devel@rtems.org
http://lists.rtems.org/mailman/listinfo/devel

[PATCH 08/14] testsuite/irhealstone: Merged nested Makefile.am files into one Makefile.am

[Chris Johns]

This change is part of the testsuite Makefile.am reorganization.

Update #3382
---
 testsuites/rhealstone/Makefile.am   | 77 ++---
 testsuites/rhealstone/configure.ac  | 18 +++---
 testsuites/rhealstone/rhdeadlockbrk/Makefile.am | 23 
 testsuites/rhealstone/rhilatency/Makefile.am| 23 
 testsuites/rhealstone/rhmlatency/Makefile.am| 23 
 testsuites/rhealstone/rhsemshuffle/Makefile.am  | 23 
 testsuites/rhealstone/rhtaskpreempt/Makefile.am | 23 
 testsuites/rhealstone/rhtaskswitch/Makefile.am  | 23 
 8 files changed, 78 insertions(+), 155 deletions(-)
 delete mode 100644 testsuites/rhealstone/rhdeadlockbrk/Makefile.am
 delete mode 100644 testsuites/rhealstone/rhilatency/Makefile.am
 delete mode 100644 testsuites/rhealstone/rhmlatency/Makefile.am
 delete mode 100644 testsuites/rhealstone/rhsemshuffle/Makefile.am
 delete mode 100644 testsuites/rhealstone/rhtaskpreempt/Makefile.am
 delete mode 100644 testsuites/rhealstone/rhtaskswitch/Makefile.am

diff --git a/testsuites/rhealstone/Makefile.am 
b/testsuites/rhealstone/Makefile.am
index e2dcf694da..dd558445a9 100644
--- a/testsuites/rhealstone/Makefile.am
+++ b/testsuites/rhealstone/Makefile.am
@@ -1,12 +1,73 @@
+#
+# Real-time Benchmarking
+#
+
 ACLOCAL_AMFLAGS = -I ../aclocal
 
-_SUBDIRS  =
-_SUBDIRS += rhdeadlockbrk
-_SUBDIRS += rhilatency
-_SUBDIRS += rhmlatency
-_SUBDIRS += rhsemshuffle
-_SUBDIRS += rhtaskpreempt
-_SUBDIRS += rhtaskswitch
+include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
+include $(top_srcdir)/../automake/compile.am
+
+rhealstones =
+rhealstone_screens =
+rhealstone_docs =
+
+support_includes = -I$(top_srcdir)/../support/include
+
+if TEST_rhdeadlockbrk
+rhealstones += rhdeadlockbrk
+rhealstone_docs += rhdeadlockbrk/rhdeadlockbrk.adoc
+rhdeadlockbrk_SOURCES = rhdeadlockbrk/deadlockbrk.c \
+   ../tmtests/include/timesys.h
+rhdeadlockbrk_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_rhdeadlockbrk) \
+   $(support_includes) -I$(top_srcdir)/../tmtests/include
+endif
+
+if TEST_rhilatency
+rhealstones += rhilatency
+rhealstone_docs += rhilatency/rhilatency.adoc
+rhilatency_SOURCES = rhilatency/ilatency.c \
+   ../tmtests/include/timesys.h
+rhilatency_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_rhilatency) \
+   $(support_includes) -I$(top_srcdir)/../tmtests/include
+endif
+
+if TEST_rhmlatency
+rhealstones += rhmlatency
+rhealstone_docs += rhmlatency/rhmlatency.adoc
+rhmlatency_SOURCES = rhmlatency/mlatency.c \
+   ../tmtests/include/timesys.h
+rhmlatency_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_rhmlatency) \
+   $(support_includes) -I$(top_srcdir)/../tmtests/include
+endif
+
+if TEST_rhsemshuffle
+rhealstones += rhsemshuffle
+rhealstone_docs += rhsemshuffle/rhsemshuffle.adoc
+rhsemshuffle_SOURCES = rhsemshuffle/semshuffle.c \
+   ../tmtests/include/timesys.h
+rhsemshuffle_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_rhsemshuffle) \
+   $(support_includes) -I$(top_srcdir)/../tmtests/include
+endif
+
+if TEST_rhtaskpreempt
+rhealstones += rhtaskpreempt
+rhealstone_docs += rhtaskpreempt/rhtaskpreempt.adoc
+rhtaskpreempt_SOURCES = rhtaskpreempt/taskpreempt.c \
+   ../tmtests/include/timesys.h
+rhtaskpreempt_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_rhtaskpreempt) \
+   $(support_includes) -I$(top_srcdir)/../tmtests/include
+endif
+
+if TEST_rhtaskswitch
+rhealstones += rhtaskswitch
+rhealstone_docs += rhtaskswitch/rhtaskswitch.adoc
+rhtaskswitch_SOURCES = rhtaskswitch/taskswitch.c \
+   ../tmtests/include/timesys.h
+rhtaskswitch_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_rhtaskswitch) \
+   $(support_includes) -I$(top_srcdir)/../tmtests/include
+endif
+
+rtems_tests_PROGRAMS = $(rhealstones)
+dist_rtems_tests_DATA = $(rhealstone_screens) $(rhealstone_docs)
 
-include $(top_srcdir)/../automake/subdirs.am
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/rhealstone/configure.ac 
b/testsuites/rhealstone/configure.ac
index 9319c28a5c..7c60f3bb8c 100644
--- a/testsuites/rhealstone/configure.ac
+++ b/testsuites/rhealstone/configure.ac
@@ -25,13 +25,13 @@ RTEMS_CANONICALIZE_TOOLS
 
 RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP)
 
-# Explicitly list all Makefiles here
-AC_CONFIG_FILES([Makefile
-rhdeadlockbrk/Makefile
-rhilatency/Makefile
-rhmlatency/Makefile
-rhsemshuffle/Makefile
-rhtaskpreempt/Makefile
-rhtaskswitch/Makefile
-])
+# BSP Test configuration
+RTEMS_TEST_CHECK([rhdeadlockbrk])
+RTEMS_TEST_CHECK([rhilatency])
+RTEMS_TEST_CHECK([rhmlatency])
+RTEMS_TEST_CHECK([rhsemshuffle])
+RTEMS_TEST_CHECK([rhtaskpreempt])
+RTEMS_TEST_CHECK([rhtaskswitch])
+
+AC_CONFIG_FILES([Makefile])
 AC_OUTPUT
diff --git a/testsuites/rhealstone/rhdeadlockbrk/Makefile.am 
b/testsuites/rhealstone/rhdeadlockbrk/Makefile.am
deleted file mode 100644
index 3f6eebf9ff..00
--- a/testsuites/rhealstone/rhdeadlockbrk/Makefile.am
+++ /dev/null
@@ -1,23 +0,0 @@
-MANAGERS = all
-
-rtems_tests_PROGRAMS = rhdeadlockbrk
-rhdeadlockbrk_SOURCES  = 

[PATCH 13/14] testsuites: Remove the test check from the subdir support.

[Chris Johns]

Leave the parallel support so each test group builds in parallel.

Update #3382
---
 testsuites/automake/subdirs.am | 26 +++---
 1 file changed, 3 insertions(+), 23 deletions(-)

diff --git a/testsuites/automake/subdirs.am b/testsuites/automake/subdirs.am
index 4bedcb74f0..e0ddab46f0 100644
--- a/testsuites/automake/subdirs.am
+++ b/testsuites/automake/subdirs.am
@@ -16,29 +16,9 @@ $1:
  if test "target" = "all-local"; then \
target="all"; \
  fi; \
- tcheck="$(top_srcdir)/../../tools/build/rtems-test-check-py"; \
- tdata="$(RTEMS_BSP)-testsuite.tcfg"; \
- 
tincludes="$(top_srcdir)/../../c/src/lib/libbsp/$(RTEMS_CPU)/$(RTEMS_BSP_FAMILY)/make/custom:$(top_srcdir)/..";
 \
- if test -f tcheck; then \
-   check_result=`tcheck exclude $(RTEMS_BSP) tdata 
tincludes $(1)`; \
- else \
-   check_result="$(1)"; \
- fi; \
- if test "$(1)" = "check_result"; then \
-   if test -f tcheck; then \
- test_FLAGS=`tcheck flags $(RTEMS_BSP) tdata tincludes 
$(1)`; \
-   fi; \
-   if test -z "test_FLAGS"; then \
- echo "BSP Testsuite: $(1): PASS"; \
-   else \
- echo "BSP Testsuite: $(1): test_FLAGS"; \
-   fi; \
-   echo "Making target in $(1)"; \
-   cd $(1); \
-   $(MAKE) $(AM_MAKEFLAGS) TEST_FLAGS="test_FLAGS" target; \
- else \
-   echo "BSP Testsuite: $(1): EXCLUDED"; \
- fi; \
+ echo "Making target in $(1)"; \
+ cd $(1); \
+ $(MAKE) $(AM_MAKEFLAGS) TEST_FLAGS="test_FLAGS" target; \
fi;
 endef
 
-- 
2.15.1

___
devel mailing list
devel@rtems.org
http://lists.rtems.org/mailman/listinfo/devel

[PATCH 14/14] bsp/lpc24xx: Exclude iconv POSIX tests.

[Chris Johns]

These are now build to executables and are too large for this BSP.

This change is part of the testsuite Makefile.am reorganization.

Update #3382
---
 c/src/lib/libbsp/arm/lpc24xx/make/custom/lpc2362-testsuite.tcfg | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/c/src/lib/libbsp/arm/lpc24xx/make/custom/lpc2362-testsuite.tcfg 
b/c/src/lib/libbsp/arm/lpc24xx/make/custom/lpc2362-testsuite.tcfg
index 3139f5f729..e0c8e503dc 100644
--- a/c/src/lib/libbsp/arm/lpc24xx/make/custom/lpc2362-testsuite.tcfg
+++ b/c/src/lib/libbsp/arm/lpc24xx/make/custom/lpc2362-testsuite.tcfg
@@ -18,6 +18,9 @@ exclude: fsdosfsformat01
 exclude: fsjffs2gc01
 exclude: fsrfsbitmap01
 exclude: ftp01
+exclude: iconv
+exclude: iconv_close
+exclude: iconv_open
 exclude: iostream
 exclude: jffs2_fserror
 exclude: jffs2_fslink
-- 
2.15.1

___
devel mailing list
devel@rtems.org
http://lists.rtems.org/mailman/listinfo/devel

[PATCH 12/14] testsuite/tmtests: Merged nested Makefile.am files into one Makefile.am

[Chris Johns]

This change is part of the testsuite Makefile.am reorganization.

Update #3382
---
 testsuites/tmtests/Makefile.am | 400 -
 testsuites/tmtests/configure.ac|  88 +++
 testsuites/tmtests/tm01/Makefile.am|  24 --
 testsuites/tmtests/tm02/Makefile.am|  25 --
 testsuites/tmtests/tm03/Makefile.am|  25 --
 testsuites/tmtests/tm04/Makefile.am|  24 --
 testsuites/tmtests/tm05/Makefile.am|  24 --
 testsuites/tmtests/tm06/Makefile.am|  24 --
 testsuites/tmtests/tm07/Makefile.am|  24 --
 testsuites/tmtests/tm08/Makefile.am|  24 --
 testsuites/tmtests/tm09/Makefile.am|  24 --
 testsuites/tmtests/tm10/Makefile.am|  24 --
 testsuites/tmtests/tm11/Makefile.am|  24 --
 testsuites/tmtests/tm12/Makefile.am|  24 --
 testsuites/tmtests/tm13/Makefile.am|  24 --
 testsuites/tmtests/tm14/Makefile.am|  24 --
 testsuites/tmtests/tm15/Makefile.am|  24 --
 testsuites/tmtests/tm16/Makefile.am|  24 --
 testsuites/tmtests/tm17/Makefile.am|  24 --
 testsuites/tmtests/tm18/Makefile.am|  24 --
 testsuites/tmtests/tm19/Makefile.am|  24 --
 testsuites/tmtests/tm20/Makefile.am|  24 --
 testsuites/tmtests/tm21/Makefile.am|  24 --
 testsuites/tmtests/tm22/Makefile.am|  24 --
 testsuites/tmtests/tm23/Makefile.am|  24 --
 testsuites/tmtests/tm24/Makefile.am|  24 --
 testsuites/tmtests/tm25/Makefile.am|  24 --
 testsuites/tmtests/tm26/Makefile.am|  24 --
 testsuites/tmtests/tm27/Makefile.am|  24 --
 testsuites/tmtests/tm28/Makefile.am|  24 --
 testsuites/tmtests/tm29/Makefile.am|  24 --
 testsuites/tmtests/tm30/Makefile.am|  24 --
 testsuites/tmtests/tm31/Makefile.am|  28 --
 testsuites/tmtests/tm32/Makefile.am|  27 --
 testsuites/tmtests/tm33/Makefile.am|  28 --
 testsuites/tmtests/tm34/Makefile.am|  27 --
 testsuites/tmtests/tm35/Makefile.am|  28 --
 testsuites/tmtests/tm36/Makefile.am|  27 --
 testsuites/tmtests/tmck/Makefile.am|  24 --
 testsuites/tmtests/tmcontext01/Makefile.am |  19 --
 testsuites/tmtests/tmfine01/Makefile.am|  19 --
 testsuites/tmtests/tmoverhd/Makefile.am|  24 --
 testsuites/tmtests/tmtimer01/Makefile.am   |  19 --
 43 files changed, 437 insertions(+), 1043 deletions(-)
 delete mode 100644 testsuites/tmtests/tm01/Makefile.am
 delete mode 100644 testsuites/tmtests/tm02/Makefile.am
 delete mode 100644 testsuites/tmtests/tm03/Makefile.am
 delete mode 100644 testsuites/tmtests/tm04/Makefile.am
 delete mode 100644 testsuites/tmtests/tm05/Makefile.am
 delete mode 100644 testsuites/tmtests/tm06/Makefile.am
 delete mode 100644 testsuites/tmtests/tm07/Makefile.am
 delete mode 100644 testsuites/tmtests/tm08/Makefile.am
 delete mode 100644 testsuites/tmtests/tm09/Makefile.am
 delete mode 100644 testsuites/tmtests/tm10/Makefile.am
 delete mode 100644 testsuites/tmtests/tm11/Makefile.am
 delete mode 100644 testsuites/tmtests/tm12/Makefile.am
 delete mode 100644 testsuites/tmtests/tm13/Makefile.am
 delete mode 100644 testsuites/tmtests/tm14/Makefile.am
 delete mode 100644 testsuites/tmtests/tm15/Makefile.am
 delete mode 100644 testsuites/tmtests/tm16/Makefile.am
 delete mode 100644 testsuites/tmtests/tm17/Makefile.am
 delete mode 100644 testsuites/tmtests/tm18/Makefile.am
 delete mode 100644 testsuites/tmtests/tm19/Makefile.am
 delete mode 100644 testsuites/tmtests/tm20/Makefile.am
 delete mode 100644 testsuites/tmtests/tm21/Makefile.am
 delete mode 100644 testsuites/tmtests/tm22/Makefile.am
 delete mode 100644 testsuites/tmtests/tm23/Makefile.am
 delete mode 100644 testsuites/tmtests/tm24/Makefile.am
 delete mode 100644 testsuites/tmtests/tm25/Makefile.am
 delete mode 100644 testsuites/tmtests/tm26/Makefile.am
 delete mode 100644 testsuites/tmtests/tm27/Makefile.am
 delete mode 100644 testsuites/tmtests/tm28/Makefile.am
 delete mode 100644 testsuites/tmtests/tm29/Makefile.am
 delete mode 100644 testsuites/tmtests/tm30/Makefile.am
 delete mode 100644 testsuites/tmtests/tm31/Makefile.am
 delete mode 100644 testsuites/tmtests/tm32/Makefile.am
 delete mode 100644 testsuites/tmtests/tm33/Makefile.am
 delete mode 100644 testsuites/tmtests/tm34/Makefile.am
 delete mode 100644 testsuites/tmtests/tm35/Makefile.am
 delete mode 100644 testsuites/tmtests/tm36/Makefile.am
 delete mode 100644 testsuites/tmtests/tmck/Makefile.am
 delete mode 100644 testsuites/tmtests/tmcontext01/Makefile.am
 delete mode 100644 testsuites/tmtests/tmfine01/Makefile.am
 delete mode 100644 testsuites/tmtests/tmoverhd/Makefile.am
 delete mode 100644 testsuites/tmtests/tmtimer01/Makefile.am

diff --git a/testsuites/tmtests/Makefile.am b/testsuites/tmtests/Makefile.am
index 8326abe329..b7fd67bdb9 100644
--- a/testsuites/tmtests/Makefile.am
+++ b/testsuites/tmtests/Makefile.am
@@ -1,11 +1,397 @@
+#
+# Timing Testuite
+#

[PATCH 10/14] testsuite/smptests: Merged nested Makefile.am files into one Makefile.am

[Chris Johns]

This change is part of the testsuite Makefile.am reorganization.

Update #3382
---
 testsuites/smptests/Makefile.am| 687 +++--
 testsuites/smptests/configure.ac   | 120 ++--
 testsuites/smptests/smp01/Makefile.am  |  22 -
 testsuites/smptests/smp02/Makefile.am  |  23 -
 testsuites/smptests/smp03/Makefile.am  |  23 -
 testsuites/smptests/smp05/Makefile.am  |  22 -
 testsuites/smptests/smp07/Makefile.am  |  22 -
 testsuites/smptests/smp08/Makefile.am  |  23 -
 testsuites/smptests/smp09/Makefile.am  |  22 -
 testsuites/smptests/smpaffinity01/Makefile.am  |  19 -
 testsuites/smptests/smpatomic01/Makefile.am|  19 -
 testsuites/smptests/smpcache01/Makefile.am |  19 -
 testsuites/smptests/smpcapture01/Makefile.am   |  19 -
 testsuites/smptests/smpcapture02/Makefile.am   |  19 -
 testsuites/smptests/smpclock01/Makefile.am |  20 -
 testsuites/smptests/smpfatal01/Makefile.am |  19 -
 testsuites/smptests/smpfatal02/Makefile.am |  19 -
 testsuites/smptests/smpfatal03/Makefile.am |  19 -
 testsuites/smptests/smpfatal04/Makefile.am |  19 -
 testsuites/smptests/smpfatal05/Makefile.am |  19 -
 testsuites/smptests/smpfatal06/Makefile.am |  19 -
 testsuites/smptests/smpfatal08/Makefile.am |  19 -
 testsuites/smptests/smpipi01/Makefile.am   |  19 -
 testsuites/smptests/smpload01/Makefile.am  |  19 -
 testsuites/smptests/smplock01/Makefile.am  |  19 -
 testsuites/smptests/smpmigration01/Makefile.am |  19 -
 testsuites/smptests/smpmigration02/Makefile.am |  19 -
 testsuites/smptests/smpmrsp01/Makefile.am  |  19 -
 testsuites/smptests/smpmutex01/Makefile.am |  19 -
 testsuites/smptests/smpmutex02/Makefile.am |  19 -
 testsuites/smptests/smpopenmp01/Makefile.am|  20 -
 testsuites/smptests/smppsxaffinity01/Makefile.am   |  23 -
 testsuites/smptests/smppsxaffinity02/Makefile.am   |  19 -
 testsuites/smptests/smppsxmutex01/Makefile.am  |  19 -
 testsuites/smptests/smppsxsignal01/Makefile.am |  19 -
 testsuites/smptests/smpschedaffinity01/Makefile.am |  19 -
 testsuites/smptests/smpschedaffinity02/Makefile.am |  19 -
 testsuites/smptests/smpschedaffinity03/Makefile.am |  19 -
 testsuites/smptests/smpschedaffinity04/Makefile.am |  19 -
 testsuites/smptests/smpschedaffinity05/Makefile.am |  19 -
 testsuites/smptests/smpschededf01/Makefile.am  |  19 -
 testsuites/smptests/smpschededf02/Makefile.am  |  19 -
 testsuites/smptests/smpschededf03/Makefile.am  |  19 -
 testsuites/smptests/smpschedsem01/Makefile.am  |  19 -
 testsuites/smptests/smpscheduler01/Makefile.am |  19 -
 testsuites/smptests/smpscheduler02/Makefile.am |  19 -
 testsuites/smptests/smpscheduler03/Makefile.am |  19 -
 testsuites/smptests/smpscheduler04/Makefile.am |  19 -
 testsuites/smptests/smpscheduler05/Makefile.am |  19 -
 testsuites/smptests/smpscheduler06/Makefile.am |  19 -
 testsuites/smptests/smpscheduler07/Makefile.am |  19 -
 testsuites/smptests/smpsignal01/Makefile.am|  19 -
 testsuites/smptests/smpstrongapa01/Makefile.am |  19 -
 .../smptests/smpswitchextension01/Makefile.am  |  19 -
 testsuites/smptests/smpthreadlife01/Makefile.am|  19 -
 testsuites/smptests/smpunsupported01/Makefile.am   |  19 -
 testsuites/smptests/smpwakeafter01/Makefile.am |  19 -
 57 files changed, 691 insertions(+), 1191 deletions(-)
 delete mode 100644 testsuites/smptests/smp01/Makefile.am
 delete mode 100644 testsuites/smptests/smp02/Makefile.am
 delete mode 100644 testsuites/smptests/smp03/Makefile.am
 delete mode 100644 testsuites/smptests/smp05/Makefile.am
 delete mode 100644 testsuites/smptests/smp07/Makefile.am
 delete mode 100644 testsuites/smptests/smp08/Makefile.am
 delete mode 100644 testsuites/smptests/smp09/Makefile.am
 delete mode 100644 testsuites/smptests/smpaffinity01/Makefile.am
 delete mode 100644 testsuites/smptests/smpatomic01/Makefile.am
 delete mode 100644 testsuites/smptests/smpcache01/Makefile.am
 delete mode 100644 testsuites/smptests/smpcapture01/Makefile.am
 delete mode 100644 testsuites/smptests/smpcapture02/Makefile.am
 delete mode 100644 testsuites/smptests/smpclock01/Makefile.am
 delete mode 100644 testsuites/smptests/smpfatal01/Makefile.am
 delete mode 100644 testsuites/smptests/smpfatal02/Makefile.am
 delete mode 100644 testsuites/smptests/smpfatal03/Makefile.am
 delete mode 100644 testsuites/smptests/smpfatal04/Makefile.am
 delete mode 100644 testsuites/smptests/smpfatal05/Makefile.am
 delete mode 100644 testsuites/smptests/smpfatal06/Makefile.am
 delete mode 100644 testsuites/smptests/smpfatal08/Makefile.am
 delete mode 100644 testsuites/smptests/smpipi01/Makefile.am
 delete mode 100644 testsuites/smptests/smpload01/Makefile.am
 delete mode 100644 

[PATCH 09/14] testsuite/samples: Merged nested Makefile.am files into one Makefile.am

[Chris Johns]

This change is part of the testsuite Makefile.am reorganization.

Update #3382
---
 testsuites/samples/Makefile.am | 170 ++---
 testsuites/samples/base_mp/Makefile.am |   5 -
 .../samples/base_mp/{node1 => }/base_mp-node1.doc  |   0
 .../samples/base_mp/{node1 => }/base_mp-node1.scn  |   0
 .../samples/base_mp/{node2 => }/base_mp-node2.doc  |   0
 .../samples/base_mp/{node2 => }/base_mp-node2.scn  |   0
 testsuites/samples/base_mp/node1/Makefile.am   |  21 ---
 testsuites/samples/base_mp/node2/Makefile.am   |  21 ---
 testsuites/samples/base_sp/Makefile.am |  22 ---
 testsuites/samples/capture/Makefile.am |  21 ---
 testsuites/samples/cdtest/Makefile.am  |  23 ---
 testsuites/samples/configure.ac|  39 +++--
 testsuites/samples/fileio/Makefile.am  |  20 ---
 testsuites/samples/hello/Makefile.am   |  21 ---
 testsuites/samples/iostream/Makefile.am|  20 ---
 testsuites/samples/loopback/Makefile.am|  21 ---
 testsuites/samples/minimum/Makefile.am |  22 ---
 testsuites/samples/nsecs/Makefile.am   |  21 ---
 testsuites/samples/paranoia/Makefile.am|  26 
 testsuites/samples/pppd/Makefile.am|  23 ---
 testsuites/samples/ticker/Makefile.am  |  22 ---
 testsuites/samples/unlimited/Makefile.am   |  22 ---
 22 files changed, 168 insertions(+), 372 deletions(-)
 delete mode 100644 testsuites/samples/base_mp/Makefile.am
 rename testsuites/samples/base_mp/{node1 => }/base_mp-node1.doc (100%)
 rename testsuites/samples/base_mp/{node1 => }/base_mp-node1.scn (100%)
 rename testsuites/samples/base_mp/{node2 => }/base_mp-node2.doc (100%)
 rename testsuites/samples/base_mp/{node2 => }/base_mp-node2.scn (100%)
 delete mode 100644 testsuites/samples/base_mp/node1/Makefile.am
 delete mode 100644 testsuites/samples/base_mp/node2/Makefile.am
 delete mode 100644 testsuites/samples/base_sp/Makefile.am
 delete mode 100644 testsuites/samples/capture/Makefile.am
 delete mode 100644 testsuites/samples/cdtest/Makefile.am
 delete mode 100644 testsuites/samples/fileio/Makefile.am
 delete mode 100644 testsuites/samples/hello/Makefile.am
 delete mode 100644 testsuites/samples/iostream/Makefile.am
 delete mode 100644 testsuites/samples/loopback/Makefile.am
 delete mode 100644 testsuites/samples/minimum/Makefile.am
 delete mode 100644 testsuites/samples/nsecs/Makefile.am
 delete mode 100644 testsuites/samples/paranoia/Makefile.am
 delete mode 100644 testsuites/samples/pppd/Makefile.am
 delete mode 100644 testsuites/samples/ticker/Makefile.am
 delete mode 100644 testsuites/samples/unlimited/Makefile.am

diff --git a/testsuites/samples/Makefile.am b/testsuites/samples/Makefile.am
index 85e89a50af..dbb4a5bd39 100644
--- a/testsuites/samples/Makefile.am
+++ b/testsuites/samples/Makefile.am
@@ -1,34 +1,162 @@
+#
+# Samples
+#
+
 ACLOCAL_AMFLAGS = -I ../aclocal
 
-_SUBDIRS  =
-_SUBDIRS += base_sp
-_SUBDIRS += capture
-_SUBDIRS += fileio
-_SUBDIRS += hello
-_SUBDIRS += minimum
-_SUBDIRS += nsecs
-_SUBDIRS += paranoia
-_SUBDIRS += ticker
-_SUBDIRS += unlimited
+include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
+include $(top_srcdir)/../automake/compile.am
+
+samples =
+sample_screens =
+sample_docs =
+
+support_includes = -I$(top_srcdir)/../support/include
 
-if MPTESTS
-## base_mp is a sample multiprocessing test
-_SUBDIRS += base_mp
+if HAS_MP
+if TEST_base_mp
+# base_mp is a sample multiprocessing test
+samples += base_mp_node1
+sample_screens += base_mp/base_mp-node1.scn
+sample_docs += base_mp/base_mp-node1.doc
+base_mp_node1_SOURCES = base_mp/init.c base_mp/apptask.c base_mp/system.h
+base_mp_node1_CPPFLAGS = -DNODE_NUMBER=1 $(AM_CPPFLAGS) $(TEST_FLAGS_base_mp) \
+   $(support_includes)
+samples += base_mp_node2
+sample_screens += base_mp/base_mp-node2.scn
+sample_docs += base_mp/base_mp-node2.doc
+base_mp_node2_SOURCES = base_mp/init.c base_mp/apptask.c base_mp/system.h
+base_mp_node2_CPPFLAGS = -DNODE_NUMBER=2 $(AM_CPPFLAGS) $(TEST_FLAGS_base_mp) \
+   $(support_includes)
+endif
+endif
+
+if TEST_base_sp
+samples += base_sp
+sample_screens += base_sp/base_sp.scn
+sample_docs += base_sp/base_sp.doc
+base_sp_SOURCES = base_sp/init.c base_sp/apptask.c base_sp/system.h
+base_sp_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_base_sp) \
+   $(support_includes)
+endif
+
+if TEST_capture
+samples += capture
+sample_screens += capture/capture.scn
+sample_docs += capture/capture.doc
+capture_SOURCES = capture/init.c capture/test1.c capture/system.h
+capture_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_capture) \
+   $(support_includes)
 endif
 
 if CXXTESTS
-_SUBDIRS += cdtest
-_SUBDIRS += iostream
+if TEST_cdtest
+samples += cdtest
+sample_screens += cdtest/cdtest.scn
+cdtest_SOURCES = cdtest/init.c cdtest/main.cc cdtest/system.h
+cdtest_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_cdtest) \
+   $(support_includes)

tch to merge nested test group Makefile.am files

[Chris Johns]

This series of patches removes the nested Makefile.am files from each test group
so each test group has a single Makefile.am. This is a large bild system change
with minor code changes to tests that depend on tar file systems.

A Makefile.am per test group is a balance between needing to nest make and
Makefile.am files we can manage and are not commit clash hot spots.

The change:

- Is the first step in being able to move to pkg-config definitions for the
  BSPs. The Makefile.am files include:

   include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg

  and this can be removed when that support is added.

- Has been tested with SMP and multiprocesing on a couple of BSPs. I have not
  tested all BSPs. I expect some small issues.

- Small memory BSPs may have linking errors with the iconv, iconv_open, and
  iconv_close tests. The libtest/POSIX tests are now built as real
  executables. I am not sure how they were being built before. These tests are
  not designed to executed on targets so the executable has been given the
  extended extension of '.norun.exe' and the rtems-test command will need to be
  updated to filter these and not run them. This was the best of a limited
  number of ways this could be handled with automake without stepping outside
  what is standard and I did not want to go there again.

- Has a specific format for each test in the Makefile.am files. This format is
  to be used from now on. Each test has the various conditional logic
  statements it needs local to each test. There is no grouping by conditional
  logic and I would like it stay that way. This approach has been done to avoid
  mismatches with a large file where the start and end need to balance across a
  large number of tests. It also avoids the mess that comes from the various
  grouping of the conditional logic that exists, for example SMP and
  C++. Adding and removing a test is local to that test and this should help
  avoid merge conflicts.

- Has used where ever possible the standard automake support provided by the
  tool.

- Assumes continued use of a directory per test in a test group.

- Attempts to standadize the conditional logic labels used. There is more that
  can be done in this area (see samples) and once done that autoconf logic can
  be moved to a macro and made common to all test groups. Also the use of:

   if HAS_SMP
   else
# someting
   endif

  has been removed. Please add a label, for example NO_SMP to configure.ac and
  use:

   if NO_SMP
# something
   endif

- Has automake conditional logic for every test. The per test check is now done
  during the configure phase. It does add time to the configure phase hoever
  there is no other way to do this with automake's conditional logic. I feel
  the extra time taken is less than the time autoconf took to write all the
  Makefiles.

- The 'make-exe' define is not used and so the 'bsp-post-link' hook is not run
  either. As a result there is no map file created or size printed. You will
  have to find the executable and run the commands.

- Has removed the need for node directories with MP tests. Those directories
  have been removed.

- has remove the need for a per-filesystem test directory to exists. The screen
  and doc files in those directories have been merged into the specific test
  directory.

Chris
___
devel mailing list
devel@rtems.org
http://lists.rtems.org/mailman/listinfo/devel

[PATCH 05/14] testsuite/mptests: Merged nested Makefile.am files into one Makefile.am

[Chris Johns]

This change is part of the testsuite Makefile.am reorganization.

Update #3382
---
 testsuites/mptests/Makefile.am | 262 +++--
 testsuites/mptests/configure.ac|  58 ++---
 testsuites/mptests/mp01/{node1 => }/mp01-node1.doc |   0
 testsuites/mptests/mp01/{node1 => }/mp01-node1.scn |   0
 testsuites/mptests/mp01/{node2 => }/mp01-node2.doc |   0
 testsuites/mptests/mp01/{node2 => }/mp01-node2.scn |   0
 testsuites/mptests/mp01/node1/Makefile.am  |  21 --
 testsuites/mptests/mp01/node2/Makefile.am  |  22 --
 testsuites/mptests/mp03/{node1 => }/mp03-node1.doc |   0
 testsuites/mptests/mp03/{node1 => }/mp03-node1.scn |   0
 testsuites/mptests/mp03/{node2 => }/mp03-node2.doc |   0
 testsuites/mptests/mp03/{node2 => }/mp03-node2.scn |   0
 testsuites/mptests/mp03/node1/Makefile.am  |  22 --
 testsuites/mptests/mp03/node2/Makefile.am  |  22 --
 testsuites/mptests/mp04/{node1 => }/mp04-node1.doc |   0
 testsuites/mptests/mp04/{node1 => }/mp04-node1.scn |   0
 testsuites/mptests/mp04/{node2 => }/mp04-node2.doc |   0
 testsuites/mptests/mp04/{node2 => }/mp04-node2.scn |   0
 testsuites/mptests/mp04/node1/Makefile.am  |  22 --
 testsuites/mptests/mp04/node2/Makefile.am  |  22 --
 testsuites/mptests/mp05/{node1 => }/mp05-node1.doc |   0
 testsuites/mptests/mp05/{node1 => }/mp05-node1.scn |   0
 testsuites/mptests/mp05/{node2 => }/mp05-node2.doc |   0
 testsuites/mptests/mp05/{node2 => }/mp05-node2.scn |   0
 testsuites/mptests/mp05/node1/Makefile.am  |  22 --
 testsuites/mptests/mp05/node2/Makefile.am  |  22 --
 testsuites/mptests/mp06/{node1 => }/mp06-node1.doc |   0
 testsuites/mptests/mp06/{node1 => }/mp06-node1.scn |   0
 testsuites/mptests/mp06/{node2 => }/mp06-node2.doc |   0
 testsuites/mptests/mp06/{node2 => }/mp06-node2.scn |   0
 testsuites/mptests/mp06/node1/Makefile.am  |  22 --
 testsuites/mptests/mp06/node2/Makefile.am  |  22 --
 testsuites/mptests/mp07/{node1 => }/mp07-node1.doc |   0
 testsuites/mptests/mp07/{node1 => }/mp07-node1.scn |   0
 testsuites/mptests/mp07/{node2 => }/mp07-node2.doc |   0
 testsuites/mptests/mp07/{node2 => }/mp07-node2.scn |   0
 testsuites/mptests/mp07/node1/Makefile.am  |  22 --
 testsuites/mptests/mp07/node2/Makefile.am  |  22 --
 testsuites/mptests/mp08/{node1 => }/mp08-node1.doc |   0
 testsuites/mptests/mp08/{node1 => }/mp08-node1.scn |   0
 testsuites/mptests/mp08/{node2 => }/mp08-node2.doc |   0
 testsuites/mptests/mp08/{node2 => }/mp08-node2.scn |   0
 testsuites/mptests/mp08/node1/Makefile.am  |  22 --
 testsuites/mptests/mp08/node2/Makefile.am  |  22 --
 testsuites/mptests/mp09/{node1 => }/mp09-node1.doc |   0
 testsuites/mptests/mp09/{node1 => }/mp09-node1.scn |   0
 testsuites/mptests/mp09/{node2 => }/mp09-node2.doc |   0
 testsuites/mptests/mp09/{node2 => }/mp09-node2.scn |   0
 testsuites/mptests/mp09/node1/Makefile.am  |  22 --
 testsuites/mptests/mp09/node2/Makefile.am  |  22 --
 testsuites/mptests/mp10/{node1 => }/mp10-node1.doc |   0
 testsuites/mptests/mp10/{node1 => }/mp10-node1.scn |   0
 testsuites/mptests/mp10/{node2 => }/mp10-node2.doc |   0
 testsuites/mptests/mp10/{node2 => }/mp10-node2.scn |   0
 testsuites/mptests/mp10/node1/Makefile.am  |  22 --
 testsuites/mptests/mp10/node2/Makefile.am  |  22 --
 testsuites/mptests/mp11/{node1 => }/mp11-node1.doc |   0
 testsuites/mptests/mp11/{node1 => }/mp11-node1.scn |   0
 testsuites/mptests/mp11/{node2 => }/mp11-node2.doc |   0
 testsuites/mptests/mp11/{node2 => }/mp11-node2.scn |   0
 testsuites/mptests/mp11/node1/Makefile.am  |  22 --
 testsuites/mptests/mp11/node2/Makefile.am  |  22 --
 testsuites/mptests/mp12/{node1 => }/mp12-node1.doc |   0
 testsuites/mptests/mp12/{node1 => }/mp12-node1.scn |   0
 testsuites/mptests/mp12/{node2 => }/mp12-node2.doc |   0
 testsuites/mptests/mp12/{node2 => }/mp12-node2.scn |   0
 testsuites/mptests/mp12/node1/Makefile.am  |  22 --
 testsuites/mptests/mp12/node2/Makefile.am  |  22 --
 testsuites/mptests/mp13/{node1 => }/mp13-node1.doc |   0
 testsuites/mptests/mp13/{node1 => }/mp13-node1.scn |   0
 testsuites/mptests/mp13/{node2 => }/mp13-node2.doc |   0
 testsuites/mptests/mp13/{node2 => }/mp13-node2.scn |   0
 testsuites/mptests/mp13/node1/Makefile.am  |  22 --
 testsuites/mptests/mp13/node2/Makefile.am  |  22 --
 testsuites/mptests/mp14/{node1 => }/mp14-node1.doc |   0
 testsuites/mptests/mp14/{node1 => }/mp14-node1.scn |   0
 testsuites/mptests/mp14/{node2 => }/mp14-node2.doc |   0
 testsuites/mptests/mp14/{node2 => }/mp14-node2.scn |   0
 testsuites/mptests/mp14/node1/Makefile.am  |  24 --
 testsuites/mptests/mp14/node2/Makefile.am  |  24 --
 80 files changed, 262 insertions(+), 633 deletions(-)
 rename testsuites/mptests/mp01/{node1 => }/mp01-node1.doc (100%)
 rename testsuites/mptests/mp01/{node1 => 

[PATCH 04/14] testsuite/fstests: Merged nested Makefile.am files into one Makefile.am

[Chris Johns]

This change is part of the testsuite Makefile.am reorganization.

Update #3382
---
 testsuites/fstests/Makefile.am | 703 +++--
 testsuites/fstests/configure.ac| 118 ++--
 testsuites/fstests/fsbdpart01/Makefile.am  |  20 -
 testsuites/fstests/fsclose01/Makefile.am   |  19 -
 testsuites/fstests/fsdosfsformat01/Makefile.am |  19 -
 testsuites/fstests/fsdosfsname01/Makefile.am   |  21 -
 testsuites/fstests/fsdosfsname02/Makefile.am   |  19 -
 testsuites/fstests/fsdosfssync01/Makefile.am   |  19 -
 testsuites/fstests/fsdosfswrite01/Makefile.am  |  19 -
 .../{imfs_fserror => fserror}/imfs_fserror.scn |   0
 .../{jffs2_fserror => fserror}/jffs2_fserror.scn   |   0
 .../{mdosfs_fserror => fserror}/mdosfs_fserror.scn |   0
 .../{mimfs_fserror => fserror}/mimfs_fserror.scn   |   0
 .../{mrfs_fserror => fserror}/mrfs_fserror.scn |   0
 .../mrfs_fsfpathconf.scn   |   0
 testsuites/fstests/fsfseeko01/Makefile.am  |  19 -
 testsuites/fstests/fsimfsconfig01/Makefile.am  |  19 -
 testsuites/fstests/fsimfsconfig02/Makefile.am  |  19 -
 testsuites/fstests/fsimfsconfig03/Makefile.am  |  19 -
 testsuites/fstests/fsimfsgeneric01/Makefile.am |  20 -
 testsuites/fstests/fsjffs2gc01/Makefile.am |  29 -
 .../{imfs_fslink => fslink}/imfs_fslink.scn|   0
 .../{jffs2_fslink => fslink}/jffs2_fslink.scn  |   0
 .../{mimfs_fslink => fslink}/mimfs_fslink.scn  |   0
 .../{mrfs_fslink => fslink}/mrfs_fslink.scn|   0
 testsuites/fstests/fsnofs01/Makefile.am|  20 -
 .../imfs_fspatheval.scn|   0
 .../jffs2_fspatheval.scn   |   0
 .../mdosfs_fspatheval.scn  |   0
 .../mimfs_fspatheval.scn   |   0
 .../mrfs_fspatheval.scn|   0
 .../imfs_fspermission.scn  |   0
 .../jffs2_fspermission.scn |   0
 .../mimfs_fspermission-interupted.scn  |   0
 .../mrfs_fspermission.scn  |   0
 .../{imfs_fsrdwr => fsrdwr}/imfs_fsrdwr.scn|   0
 .../{jffs2_fsrdwr => fsrdwr}/jffs2_fsrdwr.scn  |   0
 .../{mdosfs_fsrdwr => fsrdwr}/mdosfs_fsrdwr.scn|   0
 .../{mimfs_fsrdwr => fsrdwr}/mimfs_fsrdwr.scn  |   0
 .../{mrfs_fsrdwr => fsrdwr}/mrfs_fsrdwr.scn|   0
 .../mimfs_fsrename.scn |   0
 testsuites/fstests/fsrfsbitmap01/Makefile.am   |  33 -
 testsuites/fstests/fsrofs01/Makefile.am|  20 -
 .../imfs_fsscandir01.scn   |   0
 .../jffs2_fsscandir01.scn  |   0
 .../mdosfs_fsscandir01.scn |   0
 .../mimfs_fsscandir01.scn  |   0
 .../mrfs_fsscandir01.scn   |   0
 .../mdosfs_fsstatvfs.scn   |   0
 .../imfs_fssymlink.scn |   0
 .../jffs2_fssymlink.scn|   0
 .../mimfs_fssymlink.scn|   0
 .../mrfs_fssymlink.scn |   0
 .../{imfs_fstime => fstime}/imfs_fstime.scn|   0
 .../{jffs2_fstime => fstime}/jffs2_fstime.scn  |   0
 .../{mimfs_fstime => fstime}/mimfs_fstime.scn  |   0
 .../{mrfs_fstime => fstime}/mrfs_fstime.scn|   0
 testsuites/fstests/imfs_fserror/Makefile.am|  31 -
 testsuites/fstests/imfs_fslink/Makefile.am |  31 -
 testsuites/fstests/imfs_fspatheval/Makefile.am |  31 -
 testsuites/fstests/imfs_fspermission/Makefile.am   |  31 -
 testsuites/fstests/imfs_fsrdwr/Makefile.am |  31 -
 testsuites/fstests/imfs_fsscandir01/Makefile.am|  31 -
 testsuites/fstests/imfs_fssymlink/Makefile.am  |  31 -
 testsuites/fstests/imfs_fstime/Makefile.am |  31 -
 testsuites/fstests/jffs2_fserror/Makefile.am   |  32 -
 testsuites/fstests/jffs2_fslink/Makefile.am|  32 -
 testsuites/fstests/jffs2_fspatheval/Makefile.am|  32 -
 testsuites/fstests/jffs2_fspermission/Makefile.am  |  32 -
 testsuites/fstests/jffs2_fsrdwr/Makefile.am|  32 -
 testsuites/fstests/jffs2_fsscandir01/Makefile.am   |  32 -
 testsuites/fstests/jffs2_fssymlink/Makefile.am |  32 -
 testsuites/fstests/jffs2_fstime/Makefile.am|  32 -
 testsuites/fstests/mdosfs_fserror/Makefile.am  |  33 -
 testsuites/fstests/mdosfs_fspatheval/Makefile.am   |  33 -
 testsuites/fstests/mdosfs_fsrdwr/Makefile.am   |  33 -
 testsuites/fstests/mdosfs_fsscandir01/Makefile.am  |  33 -
 testsuites/fstests/mdosfs_fsstatvfs/Makefile.am|  33 -
 testsuites/fstests/mdosfs_fstime/Makefile.am   |  33 -
 testsuites/fstests/mimfs_fserror/Makefile.am   |  31 -
 testsuites/fstests/mimfs_fslink/Makefile.am|  31 -
 testsuites/fstests/mimfs_fspatheval/Makefile.am|  31 -
 testsuites/fstests/mimfs_fspermission/Makefile.am 

[PATCH 02/14] testsuite/benchmarks: Merged nested Makefile.am files into one Makefile.am

[Chris Johns]

This change is part of the testsuite Makefile.am reorganization.

Update #3382
---
 testsuites/benchmarks/Makefile.am   | 50 ++---
 testsuites/benchmarks/configure.ac  | 12 +++
 testsuites/benchmarks/dhrystone/Makefile.am | 20 
 testsuites/benchmarks/linpack/Makefile.am   | 21 
 testsuites/benchmarks/whetstone/Makefile.am | 21 
 5 files changed, 51 insertions(+), 73 deletions(-)
 delete mode 100644 testsuites/benchmarks/dhrystone/Makefile.am
 delete mode 100644 testsuites/benchmarks/linpack/Makefile.am
 delete mode 100644 testsuites/benchmarks/whetstone/Makefile.am

diff --git a/testsuites/benchmarks/Makefile.am 
b/testsuites/benchmarks/Makefile.am
index 6c5fe7fb27..fe73c4bb27 100644
--- a/testsuites/benchmarks/Makefile.am
+++ b/testsuites/benchmarks/Makefile.am
@@ -1,9 +1,49 @@
+#
+# Benchmarks
+#
+
 ACLOCAL_AMFLAGS = -I ../aclocal
 
-_SUBDIRS =
-_SUBDIRS += dhrystone
-_SUBDIRS += linpack
-_SUBDIRS += whetstone
+include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
+include $(top_srcdir)/../automake/compile.am
+
+benchmarks =
+benchmark_screens =
+benchmark_docs =
+
+support_includes = -I$(top_srcdir)/../support/include
+
+if TEST_dhrystone
+benchmarks += dhrystone
+benchmark_screens += dhrystone/dhrystone.scn
+benchmark_docs += dhrystone/dhrystone.doc
+dhrystone_SOURCES = dhrystone/init.c dhrystone/dhry_1.c \
+   dhrystone/dhry_2.c
+dhrystone_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_dhrystone) \
+   $(support_includes)
+endif
+
+if TEST_linpack
+benchmarks += linpack
+benchmark_screens += linpack/linpack.scn
+benchmark_docs += linpack/linpack.doc
+linpack_SOURCES = linpack/init.c linpack/linpack-pc.c
+linpack_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_linpack) \
+   $(support_includes)
+linpack_LDADD = -lm
+endif
+
+if TEST_whetstone
+benchmarks += whetstone
+benchmark_screens += whetstone/whetstone.scn
+benchmark_docs += whetstone/whetstone.doc
+whetstone_SOURCES = whetstone/init.c whetstone/whetstone.c
+whetstone_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_whetstone) \
+   $(support_includes)
+whetstone_LDADD = -lm
+endif
+
+rtems_tests_PROGRAMS = $(benchmarks)
+dist_rtems_tests_DATA = $(benchmark_screens) $(benchmark_docs)
 
-include $(top_srcdir)/../automake/subdirs.am
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/benchmarks/configure.ac 
b/testsuites/benchmarks/configure.ac
index a9dbefccc8..4ddfca060b 100644
--- a/testsuites/benchmarks/configure.ac
+++ b/testsuites/benchmarks/configure.ac
@@ -22,10 +22,10 @@ RTEMS_CANONICALIZE_TOOLS
 
 RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP)
 
-# Explicitly list all Makefiles here
-AC_CONFIG_FILES([Makefile
-dhrystone/Makefile
-linpack/Makefile
-whetstone/Makefile
-])
+# BSP Test configuration
+RTEMS_TEST_CHECK([dhrystone])
+RTEMS_TEST_CHECK([linpack])
+RTEMS_TEST_CHECK([whetstone])
+
+AC_CONFIG_FILES([Makefile])
 AC_OUTPUT
diff --git a/testsuites/benchmarks/dhrystone/Makefile.am 
b/testsuites/benchmarks/dhrystone/Makefile.am
deleted file mode 100644
index 73b67212aa..00
--- a/testsuites/benchmarks/dhrystone/Makefile.am
+++ /dev/null
@@ -1,20 +0,0 @@
-rtems_tests_PROGRAMS = dhrystone
-dhrystone_SOURCES = init.c dhry_1.c dhry_2.c
-
-dist_rtems_tests_DATA = dhrystone.scn dhrystone.doc
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../automake/compile.am
-include $(top_srcdir)/../automake/leaf.am
-
-AM_CPPFLAGS += -I$(top_srcdir)/../support/include
-AM_CFLAGS += -fno-inline -fno-builtin
-
-LINK_OBJS = $(dhrystone_OBJECTS)
-LINK_LIBS = $(dhrystone_LDLIBS)
-
-dhrystone$(EXEEXT): $(dhrystone_OBJECTS) $(dhrystone_DEPENDENCIES)
-   @rm -f dhrystone$(EXEEXT)
-   $(make-exe)
-
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/benchmarks/linpack/Makefile.am 
b/testsuites/benchmarks/linpack/Makefile.am
deleted file mode 100644
index 2f5c25cf57..00
--- a/testsuites/benchmarks/linpack/Makefile.am
+++ /dev/null
@@ -1,21 +0,0 @@
-rtems_tests_PROGRAMS = linpack
-linpack_SOURCES = init.c linpack-pc.c
-linpack_LDADD = -lm
-
-dist_rtems_tests_DATA = linpack.scn linpack.doc
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../automake/compile.am
-include $(top_srcdir)/../automake/leaf.am
-
-AM_CPPFLAGS += -I$(top_srcdir)/../support/include
-AM_CFLAGS += -fno-inline -fno-builtin
-
-LINK_OBJS = $(linpack_OBJECTS) $(linpack_LDADD)
-LINK_LIBS = $(linpack_LDLIBS)
-
-linpack$(EXEEXT): $(linpack_OBJECTS) $(linpack_DEPENDENCIES)
-   @rm -f linpack$(EXEEXT)
-   $(make-exe)
-
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/benchmarks/whetstone/Makefile.am 
b/testsuites/benchmarks/whetstone/Makefile.am
deleted file mode 100644
index a325ddca46..00
--- a/testsuites/benchmarks/whetstone/Makefile.am
+++ /dev/null
@@ -1,21 +0,0 @@
-rtems_tests_PROGRAMS = whetstone
-whetstone_SOURCES = init.c whetstone.c
-whetstone_LDADD = -lm
-
-dist_rtems_tests_DATA = whetstone.scn 

[PATCH 03/14] testsuite/libtests: Merged nested Makefile.am files into one Makefile.am

[Chris Johns]

This change is part of the testsuite Makefile.am reorganization.

Update #3382
---
 testsuites/libtests/Makefile.am| 1331 ++--
 testsuites/libtests/POSIX/Makefile.am  |  149 ---
 testsuites/libtests/block01/Makefile.am|   21 -
 testsuites/libtests/block02/Makefile.am|   21 -
 testsuites/libtests/block03/Makefile.am|   21 -
 testsuites/libtests/block04/Makefile.am|   21 -
 testsuites/libtests/block05/Makefile.am|   21 -
 testsuites/libtests/block06/Makefile.am|   21 -
 testsuites/libtests/block07/Makefile.am|   21 -
 testsuites/libtests/block08/Makefile.am|   47 -
 testsuites/libtests/block09/Makefile.am|   21 -
 testsuites/libtests/block10/Makefile.am|   21 -
 testsuites/libtests/block11/Makefile.am|   21 -
 testsuites/libtests/block12/Makefile.am|   19 -
 testsuites/libtests/block13/Makefile.am|   19 -
 testsuites/libtests/block14/Makefile.am|   19 -
 testsuites/libtests/block15/Makefile.am|   19 -
 testsuites/libtests/block16/Makefile.am|   19 -
 testsuites/libtests/block17/Makefile.am|   19 -
 testsuites/libtests/bspcmdline01/Makefile.am   |   22 -
 testsuites/libtests/capture01/Makefile.am  |   21 -
 testsuites/libtests/complex/Makefile.am|   28 -
 testsuites/libtests/configure.ac   |  231 ++--
 testsuites/libtests/cpuuse/Makefile.am |   21 -
 testsuites/libtests/crypt01/Makefile.am|   19 -
 testsuites/libtests/debugger01/Makefile.am |   21 -
 testsuites/libtests/defaultconfig01/Makefile.am|   19 -
 testsuites/libtests/devfs01/Makefile.am|   21 -
 testsuites/libtests/devfs02/Makefile.am|   20 -
 testsuites/libtests/devfs03/Makefile.am|   20 -
 testsuites/libtests/devfs04/Makefile.am|   21 -
 testsuites/libtests/deviceio01/Makefile.am |   21 -
 testsuites/libtests/devnullfatal01/Makefile.am |   24 -
 testsuites/libtests/dl01/Makefile.am   |   46 -
 testsuites/libtests/dl01/init.c|6 +-
 testsuites/libtests/dl02/Makefile.am   |   48 -
 testsuites/libtests/dl02/init.c|6 +-
 testsuites/libtests/dl03/Makefile.am   |   19 -
 testsuites/libtests/dl04/Makefile.am   |   47 -
 testsuites/libtests/dl04/init.c|6 +-
 testsuites/libtests/dl05/Makefile.am   |   47 -
 testsuites/libtests/dl05/init.c|6 +-
 testsuites/libtests/dumpbuf01/Makefile.am  |   21 -
 testsuites/libtests/exit01/Makefile.am |   19 -
 testsuites/libtests/exit02/Makefile.am |   19 -
 testsuites/libtests/flashdisk01/Makefile.am|   19 -
 testsuites/libtests/ftp01/Makefile.am  |   23 -
 testsuites/libtests/getentropy01/Makefile.am   |   19 -
 testsuites/libtests/gxx01/Makefile.am  |   21 -
 testsuites/libtests/heapwalk/Makefile.am   |   21 -
 testsuites/libtests/i2c01/Makefile.am  |   19 -
 testsuites/libtests/libfdt01/Makefile.am   |   19 -
 testsuites/libtests/malloc02/Makefile.am   |   21 -
 testsuites/libtests/malloc03/Makefile.am   |   21 -
 testsuites/libtests/malloc04/Makefile.am   |   21 -
 testsuites/libtests/malloctest/Makefile.am |   21 -
 testsuites/libtests/math/Makefile.am   |   22 -
 testsuites/libtests/mathf/Makefile.am  |   22 -
 testsuites/libtests/mathl/Makefile.am  |   25 -
 testsuites/libtests/md501/Makefile.am  |   19 -
 testsuites/libtests/mghttpd01/Makefile.am  |   34 -
 testsuites/libtests/mghttpd01/init.c   |8 +-
 .../mghttpd01/{init_fs.tar => mghttpd01.tar}   |  Bin
 testsuites/libtests/monitor/Makefile.am|   19 -
 testsuites/libtests/monitor02/Makefile.am  |   21 -
 testsuites/libtests/mouse01/Makefile.am|   23 -
 testsuites/libtests/networking01/Makefile.am   |   22 -
 testsuites/libtests/newlib01/Makefile.am   |   19 -
 testsuites/libtests/putenvtest/Makefile.am |   21 -
 testsuites/libtests/pwdgrp01/Makefile.am   |   19 -
 testsuites/libtests/pwdgrp02/Makefile.am   |   19 -
 testsuites/libtests/rbheap01/Makefile.am   |   19 -
 testsuites/libtests/rtmonuse/Makefile.am   |   21 -
 testsuites/libtests/sha/Makefile.am|   19 -
 testsuites/libtests/shell01/Makefile.am|   19 -
 testsuites/libtests/sparsedisk01/Makefile.am   |   19 -
 testsuites/libtests/spi01/Makefile.am  |   19 -
 testsuites/libtests/stackchk/Makefile.am   |   21 -
 testsuites/libtests/stackchk01/Makefile.am |   22 -
 testsuites/libtests/stringto01/Makefile.am |   22 -
 

[PATCH 01/14] testsuite: Autoconf test check support.

[Chris Johns]

The autoconf function checks the state of a test for the BSP and
controls the building of the test.

This change is part of the testsuite Makefile.am reorganisation.

Update #3382
---
 testsuites/aclocal/rtems-test-check.m4 | 31 +++
 1 file changed, 31 insertions(+)
 create mode 100644 testsuites/aclocal/rtems-test-check.m4

diff --git a/testsuites/aclocal/rtems-test-check.m4 
b/testsuites/aclocal/rtems-test-check.m4
new file mode 100644
index 00..7c7192573b
--- /dev/null
+++ b/testsuites/aclocal/rtems-test-check.m4
@@ -0,0 +1,31 @@
+dnl
+dnl Check a test getting it's status.
+dnl
+AC_DEFUN([RTEMS_TEST_CHECK],
+[AC_REQUIRE([RTEMS_ENV_RTEMSBSP])
+ AC_REQUIRE([RTEMS_SOURCE_TOP])
+ AC_MSG_CHECKING([${RTEMS_CPU}/${RTEMS_BSP} $1 test])
+ tcheck="${RTEMS_SOURCE_ROOT}/tools/build/rtems-test-check-py"
+ tdata="${RTEMS_BSP}-testsuite.tcfg"
+ 
tincludes="${RTEMS_SOURCE_ROOT}/c/src/lib/libbsp/${RTEMS_CPU}/${RTEMS_BSP_FAMILY}/make/custom:${RTEMS_SOURCE_ROOT}/testsuites"
+ if test -f $tcheck; then
+  check_result=`$tcheck exclude ${RTEMS_BSP} $tdata $tincludes $1`
+ else
+  check_result=$1
+ fi
+ if test "$1" = "$check_result"; then
+  if test -f $tcheck; then
+   test_FLAGS=`$tcheck flags ${RTEMS_BSP} $tdata $tincludes $1`
+  fi
+  if test -z "$test_FLAGS"; then
+   result_msg="PASS"
+  else
+   result_msg="$test_FLAGS"
+  fi
+ else
+   result_msg="EXCLUDED"
+ fi
+ AC_MSG_RESULT([$result_msg])
+ AM_CONDITIONAL([TEST_$1], [test "$result_msg" != "EXCLUDED"])
+ AC_SUBST([TEST_FLAGS_$1], [$test_FLAGS])
+])
-- 
2.15.1

___
devel mailing list
devel@rtems.org
http://lists.rtems.org/mailman/listinfo/devel

[PATCH 07/14] testsuite/psxtmtests: Merged nested Makefile.am files into one Makefile.am

[Chris Johns]

This change is part of the testsuite Makefile.am reorganization.

Update #3382
---
 testsuites/psxtmtests/Makefile.am  | 716 +++--
 testsuites/psxtmtests/configure.ac | 104 +--
 testsuites/psxtmtests/psxtmbarrier01/Makefile.am   |  25 -
 testsuites/psxtmtests/psxtmbarrier02/Makefile.am   |  25 -
 testsuites/psxtmtests/psxtmbarrier03/Makefile.am   |  25 -
 testsuites/psxtmtests/psxtmbarrier04/Makefile.am   |  27 -
 .../psxtmtests/psxtmclocknanosleep01/Makefile.am   |  25 -
 .../psxtmtests/psxtmclocknanosleep02/Makefile.am   |  25 -
 .../psxtmtests/psxtmclocknanosleep03/Makefile.am   |  25 -
 testsuites/psxtmtests/psxtmcond01/Makefile.am  |  28 -
 testsuites/psxtmtests/psxtmcond02/Makefile.am  |  27 -
 testsuites/psxtmtests/psxtmcond03/Makefile.am  |  27 -
 testsuites/psxtmtests/psxtmcond04/Makefile.am  |  27 -
 testsuites/psxtmtests/psxtmcond05/Makefile.am  |  27 -
 testsuites/psxtmtests/psxtmcond06/Makefile.am  |  27 -
 testsuites/psxtmtests/psxtmcond07/Makefile.am  |  27 -
 testsuites/psxtmtests/psxtmcond08/Makefile.am  |  28 -
 testsuites/psxtmtests/psxtmcond09/Makefile.am  |  28 -
 testsuites/psxtmtests/psxtmcond10/Makefile.am  |  28 -
 testsuites/psxtmtests/psxtmkey01/Makefile.am   |  25 -
 testsuites/psxtmtests/psxtmkey02/Makefile.am   |  25 -
 testsuites/psxtmtests/psxtmmq01/Makefile.am|  26 -
 testsuites/psxtmtests/psxtmmutex01/Makefile.am |  25 -
 testsuites/psxtmtests/psxtmmutex02/Makefile.am |  25 -
 testsuites/psxtmtests/psxtmmutex03/Makefile.am |  25 -
 testsuites/psxtmtests/psxtmmutex04/Makefile.am |  25 -
 testsuites/psxtmtests/psxtmmutex05/Makefile.am |  25 -
 testsuites/psxtmtests/psxtmmutex06/Makefile.am |  25 -
 testsuites/psxtmtests/psxtmmutex07/Makefile.am |  25 -
 testsuites/psxtmtests/psxtmnanosleep01/Makefile.am |  25 -
 testsuites/psxtmtests/psxtmnanosleep02/Makefile.am |  25 -
 testsuites/psxtmtests/psxtmrwlock01/Makefile.am|  25 -
 testsuites/psxtmtests/psxtmrwlock02/Makefile.am|  25 -
 testsuites/psxtmtests/psxtmrwlock03/Makefile.am|  25 -
 testsuites/psxtmtests/psxtmrwlock04/Makefile.am|  25 -
 testsuites/psxtmtests/psxtmrwlock05/Makefile.am|  25 -
 testsuites/psxtmtests/psxtmrwlock06/Makefile.am|  25 -
 testsuites/psxtmtests/psxtmrwlock07/Makefile.am|  26 -
 testsuites/psxtmtests/psxtmsem01/Makefile.am   |  25 -
 testsuites/psxtmtests/psxtmsem02/Makefile.am   |  25 -
 testsuites/psxtmtests/psxtmsem03/Makefile.am   |  25 -
 testsuites/psxtmtests/psxtmsem04/Makefile.am   |  25 -
 testsuites/psxtmtests/psxtmsem05/Makefile.am   |  25 -
 testsuites/psxtmtests/psxtmsleep01/Makefile.am |  25 -
 testsuites/psxtmtests/psxtmsleep02/Makefile.am |  25 -
 testsuites/psxtmtests/psxtmthread01/Makefile.am|  25 -
 testsuites/psxtmtests/psxtmthread02/Makefile.am|  27 -
 testsuites/psxtmtests/psxtmthread03/Makefile.am|  25 -
 testsuites/psxtmtests/psxtmthread04/Makefile.am|  27 -
 testsuites/psxtmtests/psxtmthread05/Makefile.am|  27 -
 testsuites/psxtmtests/psxtmthread06/Makefile.am|  27 -
 51 files changed, 711 insertions(+), 1370 deletions(-)
 delete mode 100644 testsuites/psxtmtests/psxtmbarrier01/Makefile.am
 delete mode 100644 testsuites/psxtmtests/psxtmbarrier02/Makefile.am
 delete mode 100644 testsuites/psxtmtests/psxtmbarrier03/Makefile.am
 delete mode 100644 testsuites/psxtmtests/psxtmbarrier04/Makefile.am
 delete mode 100644 testsuites/psxtmtests/psxtmclocknanosleep01/Makefile.am
 delete mode 100644 testsuites/psxtmtests/psxtmclocknanosleep02/Makefile.am
 delete mode 100644 testsuites/psxtmtests/psxtmclocknanosleep03/Makefile.am
 delete mode 100644 testsuites/psxtmtests/psxtmcond01/Makefile.am
 delete mode 100644 testsuites/psxtmtests/psxtmcond02/Makefile.am
 delete mode 100644 testsuites/psxtmtests/psxtmcond03/Makefile.am
 delete mode 100644 testsuites/psxtmtests/psxtmcond04/Makefile.am
 delete mode 100644 testsuites/psxtmtests/psxtmcond05/Makefile.am
 delete mode 100644 testsuites/psxtmtests/psxtmcond06/Makefile.am
 delete mode 100644 testsuites/psxtmtests/psxtmcond07/Makefile.am
 delete mode 100644 testsuites/psxtmtests/psxtmcond08/Makefile.am
 delete mode 100644 testsuites/psxtmtests/psxtmcond09/Makefile.am
 delete mode 100644 testsuites/psxtmtests/psxtmcond10/Makefile.am
 delete mode 100644 testsuites/psxtmtests/psxtmkey01/Makefile.am
 delete mode 100644 testsuites/psxtmtests/psxtmkey02/Makefile.am
 delete mode 100644 testsuites/psxtmtests/psxtmmq01/Makefile.am
 delete mode 100644 testsuites/psxtmtests/psxtmmutex01/Makefile.am
 delete mode 100644 testsuites/psxtmtests/psxtmmutex02/Makefile.am
 delete mode 100644 testsuites/psxtmtests/psxtmmutex03/Makefile.am
 delete mode 100644 testsuites/psxtmtests/psxtmmutex04/Makefile.am
 delete mode 100644 testsuites/psxtmtests/psxtmmutex05/Makefile.am
 delete mode 100644 testsuites/psxtmtests/psxtmmutex06/Makefile.am
 delete mode 

Re: [PATCH 6/6] waf: Add configurations with different modules.

[Chris Johns]

On 06/04/2018 22:26, Christian Mauderer wrote:
> This allows multiple build configurations (buildsets) with different
> modules enabled.
> 
> Update #3351
> ---
>  CONTRIBUTING.md  |   7 ++-
>  README.waf   |   3 +-
>  builder.py   |  13 ++---
>  buildset/default.ini |  58 ++
>  buildset/sample.ini  |  10 
>  libbsd.py|   2 +-
>  rtems_waf|   2 +-
>  waf_libbsd.py|   9 
>  wscript  | 136 
> +--
>  9 files changed, 203 insertions(+), 37 deletions(-)
>  create mode 100644 buildset/default.ini
>  create mode 100644 buildset/sample.ini
> 
> diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
> index eddefe98..9e6ee83c 100644
> --- a/CONTRIBUTING.md
> +++ b/CONTRIBUTING.md
> @@ -67,8 +67,7 @@ freebsd-to-rtems.py [args]
>  ```
>  
>  In its default mode of operation, freebsd-to-rtems.py is used to copy code
> -from FreeBSD to the rtems-libbsd tree and perform transformations.  In 
> forward
> -mode, the script may be requested to just generate the Waf script.
> +from FreeBSD to the rtems-libbsd tree and perform transformations.
>  
>  In *reverse mode*, this script undoes those transformations and copies
>  the source code back to the *master* FreeBSD tree. This allows us to do
> @@ -126,9 +125,9 @@ How to import code from FreeBSD
>  * Run `./freebsd-to-rtems.py -R`
>  * Run `./freebsd-to-rtems.py`
>  * Run `git status` and make sure your working directory is clean.  If you 
> see modified files, then the `freebsd-to-rtems.py` script needs to be fixed 
> first.
> -* Add the files to import to `libbsd.py`.
> +* Add the files to import to `libbsd.py` and your intended build set (for 
> example `buildset/default.ini`.
>  * Run `./freebsd-to-rtems.py`
> -* Immediately check in the imported files without the changes to 
> `libbsd_waf.py`.  Do not touch the imported files yourself at this point.
> +* Immediately check in the imported files without the changes to `libbsd.py` 
> and the buildsets.  Do not touch the imported files yourself at this point.
>  * Port the imported files to RTEMS.  See 'Rules for Modifying FreeBSD 
> Source'.
>  * Add a test to the testsuite if possible.
>  * Run `./create-kernel-namespace.sh` if you imported kernel space headers.  
> Add only your new defines via `git add -p 
> rtemsbsd/include/machine/rtems-bsd-kernel-namespace.h`.
> diff --git a/README.waf b/README.waf
> index dddc04a4..485a1899 100644
> --- a/README.waf
> +++ b/README.waf
> @@ -73,7 +73,8 @@ cd rtems-libbsd
>  git submodule init
>  git submodule update rtems_waf
>  waf configure --prefix="$sandbox/rtems-4.12" \
> -  --rtems-bsps=arm/xilinx_zynq_a9_qemu
> +  --rtems-bsps=arm/xilinx_zynq_a9_qemu \
> +  --buildset=buildset/default.ini

Is this the default and so if you do not add a --buildset option you get this?

It might pay to highlight this if it is the case.

>  waf
>  waf install
>  qemu-system-arm -no-reboot -serial null -serial mon:stdio -net none \
> diff --git a/builder.py b/builder.py
> index bb5791a8..c968e05c 100755
> --- a/builder.py
> +++ b/builder.py
> @@ -44,6 +44,7 @@ import getopt
>  import filecmp
>  import difflib
>  import codecs
> +import copy
>  
>  #
>  # Global controls.
> @@ -487,15 +488,11 @@ class Module(object):
>  def __init__(self, manager, name, enabled = True):
>  self.manager = manager
>  self.name = name
> -self.enabled = enabled
>  self.conditionalOn = "none"
>  self.files = []
>  self.cpuDependentSourceFiles = {}
>  self.dependencies = []
>  
> -def isEnabled(self):
> -return self.enabled
> -
>  def initCPUDependencies(self, cpu):
>  if cpu not in self.cpuDependentSourceFiles:
>  self.cpuDependentSourceFiles[cpu] = []
> @@ -664,15 +661,19 @@ class ModuleManager(object):
>  self.modules[m].processSource(direction)
>  
>  def setConfiguration(self, config):
> -self.configuration = config
> +self.configuration = copy.deepcopy(config)
>  
>  def getConfiguration(self):
>  return self.configuration
>  
> +def updateConfiguration(self, config):
> +self.configuration.update(config)
> +
>  def setModuleConfigiuration(self):
>  mods = sorted(self.modules.keys())
>  self.configuration['modules'] = mods
> -self.configuration['modules-enabled'] = [m for m in mods if 
> self.modules[m].isEnabled()]
> +# Enabled modules are overwritten by config file. Default to all.
> +self.configuration['modules-enabled'] = mods
>  
>  def generateBuild(self, only_enabled=True):
>  modules_to_process = self.getEnabledModules()
> diff --git a/buildset/default.ini b/buildset/default.ini
> new file mode 100644
> index ..15b57df4
> --- /dev/null
> +++ b/buildset/default.ini
> @@ -0,0 +1,58 @@
> +#
> +# Default configuration.
> +#
> +
> +[general]
> +name = default
> +
> 

Re: [PATCH 3/6] waf: Fix freebsd-to-rtems.py.

[Chris Johns]

On 06/04/2018 22:26, Christian Mauderer wrote:
> Update #3351
> ---
>  builder.py  | 3 +++
>  freebsd-to-rtems.py | 3 ++-
>  waf_libbsd.py   | 7 +--
>  3 files changed, 10 insertions(+), 3 deletions(-)
> 
> diff --git a/builder.py b/builder.py
> index 2faf98d0..ac199a9b 100755
> --- a/builder.py
> +++ b/builder.py
> @@ -677,3 +677,6 @@ class ModuleManager(object):
>  def generateBuild(self):
>  for m in self.getEnabledModules():
>  self.modules[m].generate()
> +
> +def setGenerators(self):
> +pass
> diff --git a/freebsd-to-rtems.py b/freebsd-to-rtems.py
> index c2f00f86..ec0fcc9a 100755
> --- a/freebsd-to-rtems.py
> +++ b/freebsd-to-rtems.py
> @@ -43,6 +43,7 @@ import getopt
>  
>  import builder
>  import libbsd
> +import waf_libbsd

I am not comfortable with this happening.

What functionality in waf_libbsd do you need here?

Can it be moved to the builder class?

>  
>  isForward = True
>  isEarlyExit = False
> @@ -142,7 +143,7 @@ if isEarlyExit == True:
>  sys.exit(0)
>  
>  try:
> -build = builder.ModuleManager()
> +build = waf_libbsd.Builder()
>  libbsd.load(build)
>  build.generateBuild()
>  build.processSource(isForward)
> diff --git a/waf_libbsd.py b/waf_libbsd.py
> index eddfaf99..ae8a1ea0 100644
> --- a/waf_libbsd.py
> +++ b/waf_libbsd.py
> @@ -40,8 +40,6 @@ import tempfile
>  
>  import builder
>  
> -import rtems_waf.rtems as rtems

I like this being here because it is loud and clear this is an RTEMS waf app.

> -
>  windows = os.name == 'nt'
>  
>  if windows:
> @@ -316,6 +314,11 @@ class Builder(builder.ModuleManager):
>  pass
>  
>  def build(self, bld):
> +# This is only necessary for build. But it depends on the waflib 
> which
> +# is only available in a waf context. But we need the module manager 
> for
> +# freebsd_to_rtems.py too.

If functionality is to be shared it should be moved to the base module.

Chris

> +import rtems_waf.rtems as rtems
> +
>  #
>  # Localize the config.
>  #
> 
___
devel mailing list
devel@rtems.org
http://lists.rtems.org/mailman/listinfo/devel

Re: [PATCH v2] Fix bsp_init hook.

[Chris Johns]

Pushed.

Thanks
Chris

On 06/04/2018 22:07, Christian Mauderer wrote:
> ---
>  rtems.py | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/rtems.py b/rtems.py
> index 713066d..6907709 100644
> --- a/rtems.py
> +++ b/rtems.py
> @@ -89,6 +89,8 @@ def init(ctx, filters = None, version = None, long_commands 
> = False, bsp_init =
>  #
>  rtems_long_commands = long_commands
>  
> +env = None
> +contexts = []
>  try:
>  import waflib.Options
>  import waflib.ConfigSet
> @@ -116,7 +118,6 @@ def init(ctx, filters = None, version = None, 
> long_commands = False, bsp_init =
>  #
>  from waflib.Build import BuildContext, CleanContext, \
>  InstallContext, UninstallContext
> -contexts = []
>  for x in arch_bsps:
>  for y in (BuildContext, CleanContext, InstallContext, 
> UninstallContext):
>  name = y.__name__.replace('Context','').lower()
> 
___
devel mailing list
devel@rtems.org
http://lists.rtems.org/mailman/listinfo/devel

ARM build failing

[Chris Johns]

Hi,

I am testing testsuite Makefile.am changes and the following configure:

/opt/work/chris/rtems/kernel/rtems.git/configure --prefix=/opt/work/rtems/bsps/5
--target=arm-rtems5 --enable-posix --enable-networking --enable-smp
--enable-tests --enable-maintainer-mode

fails with:

gmake[5]: Entering directory
'/opt/work/chris/rtems/kernel/bsps/arm/arm-rtems5/c/atsamv/cpukit/score'
arm-rtems5-gcc --pipe -DHAVE_CONFIG_H   -I..
-I/opt/work/chris/rtems/kernel/bsps/arm/arm-rtems5/c/atsamv/include
-I/opt/work/chris/rtems/kernel/rtems.git/cpukit/include
-I/opt/work/chris/rtems/kernel/rtems.git/cpukit/score/cpu/arm/include
-I/opt/work/chris/rtems/kernel/rtems.git/cpukit/libnetworking   -mthumb
-mcpu=cortex-m7 -mfpu=fpv5-d16 -mfloat-abi=hard -O2 -g -ffunction-sections
-fdata-sections -MT src/libscore_a-percpustatewait.o -MD -MP -MF
src/.deps/libscore_a-percpustatewait.Tpo -c -o src/libscore_a-percpustatewait.o
`test -f 'src/percpustatewait.c' || echo
'/opt/work/chris/rtems/kernel/rtems.git/c/src/../../cpukit/score/'`src/percpustatewait.c
In file included from
/opt/work/chris/rtems/kernel/rtems.git/c/src/../../cpukit/score/src/percpustatewait.c:19:0:
/opt/work/chris/rtems/kernel/rtems.git/cpukit/include/rtems/score/percpu.h:384:3:
error: unknown type name 'CPU_Interrupt_frame'
   CPU_Interrupt_frame Interrupt_frame;
   ^~~

I believe I have everything on the latest.

Chris
___
devel mailing list
devel@rtems.org
http://lists.rtems.org/mailman/listinfo/devel

GSoC Proposal

[Elliott, Braden]

Hello,

I apologize for the late communication, and although the deadline has passed 
for official proposal submissions I would greatly appreciate any advice on my 
proposal for an STM32F446RE BSP.
The proposal can be found on the GSoC Tracking 
Page or the link below.

https://docs.google.com/document/d/1nUlxKEiiW19ZxnN1Zn_ZLNP4R30kSAMXEF9VwQizq3w/edit?usp=sharing

Thank you
Braden Elliott
___
devel mailing list
devel@rtems.org
http://lists.rtems.org/mailman/listinfo/devel