From 9282d5765deacaf5cf135622008146a52cb75c6f Mon Sep 17 00:00:00 2001 From: neil Date: Mon, 18 Jan 2016 02:19:39 +0000 Subject: [PATCH] Created and populated a 'misc' subdir for tests that match one of the following criteria: - The test isn't specific to a particular system component. - The component that is tested currently has only one test. git-svn-id: https://svn.aros.org/svn/aros/trunk/AROS@51325 fb15a70f-31f2-0310-bbcc-cdcc74a49acc --- test/layers/mmakefile.src | 2 +- test/{ => layers}/sortlayercr.c | 0 test/{ => misc}/camdtree.c | 0 test/{ => misc}/fileseek.c | 0 test/{ => misc}/frequencies.c | 0 test/{ => misc}/fsresource.c | 0 test/{ => misc}/getcpuinfo.c | 0 test/{ => misc}/helloworld.c | 0 test/{ => misc}/hostcb.c | 0 test/{ => misc}/hostlib.c | 0 test/{ => misc}/iffparsewrite.c | 0 test/{ => misc}/ilbmtoc.c | 0 test/{ => misc}/ilbmtoc_image.c | 0 test/{ => misc}/inquire.c | 0 test/{ => misc}/joystick.c | 0 test/{ => misc}/mathffp.c | 0 test/{ => misc}/mathtest.c | 0 test/misc/mmakefile.src | 32 ++++++++++++++++++++++++++++++++ test/{ => misc}/partition.c | 0 test/{ => misc}/pcilist.c | 0 test/{ => misc}/pthreadtest.c | 0 test/{ => misc}/true.c | 0 test/{ => misc}/unixio.c | 0 test/{ => misc}/versionlib.c | 0 test/mmakefile.src | 21 ++------------------- test/testscript | 2 +- 26 files changed, 36 insertions(+), 21 deletions(-) rename test/{ => layers}/sortlayercr.c (100%) rename test/{ => misc}/camdtree.c (100%) rename test/{ => misc}/fileseek.c (100%) rename test/{ => misc}/frequencies.c (100%) rename test/{ => misc}/fsresource.c (100%) rename test/{ => misc}/getcpuinfo.c (100%) rename test/{ => misc}/helloworld.c (100%) rename test/{ => misc}/hostcb.c (100%) rename test/{ => misc}/hostlib.c (100%) rename test/{ => misc}/iffparsewrite.c (100%) rename test/{ => misc}/ilbmtoc.c (100%) rename test/{ => misc}/ilbmtoc_image.c (100%) rename test/{ => misc}/inquire.c (100%) rename test/{ => misc}/joystick.c (100%) rename test/{ => misc}/mathffp.c (100%) rename test/{ => misc}/mathtest.c (100%) create mode 100644 test/misc/mmakefile.src rename test/{ => misc}/partition.c (100%) rename test/{ => misc}/pcilist.c (100%) rename test/{ => misc}/pthreadtest.c (100%) rename test/{ => misc}/true.c (100%) rename test/{ => misc}/unixio.c (100%) rename test/{ => misc}/versionlib.c (100%) diff --git a/test/layers/mmakefile.src b/test/layers/mmakefile.src index b5c50df118..de27cc0332 100644 --- a/test/layers/mmakefile.src +++ b/test/layers/mmakefile.src @@ -1,6 +1,6 @@ include $(TOP)/config/make.cfg -FILES := CRList DamageList clippingtest layerstest +FILES := CRList DamageList clippingtest layerstest sortlayercr %build_progs mmake=test-layers \ files=$(FILES) targetdir=$(AROS_TESTS)/layers diff --git a/test/sortlayercr.c b/test/layers/sortlayercr.c similarity index 100% rename from test/sortlayercr.c rename to test/layers/sortlayercr.c diff --git a/test/camdtree.c b/test/misc/camdtree.c similarity index 100% rename from test/camdtree.c rename to test/misc/camdtree.c diff --git a/test/fileseek.c b/test/misc/fileseek.c similarity index 100% rename from test/fileseek.c rename to test/misc/fileseek.c diff --git a/test/frequencies.c b/test/misc/frequencies.c similarity index 100% rename from test/frequencies.c rename to test/misc/frequencies.c diff --git a/test/fsresource.c b/test/misc/fsresource.c similarity index 100% rename from test/fsresource.c rename to test/misc/fsresource.c diff --git a/test/getcpuinfo.c b/test/misc/getcpuinfo.c similarity index 100% rename from test/getcpuinfo.c rename to test/misc/getcpuinfo.c diff --git a/test/helloworld.c b/test/misc/helloworld.c similarity index 100% rename from test/helloworld.c rename to test/misc/helloworld.c diff --git a/test/hostcb.c b/test/misc/hostcb.c similarity index 100% rename from test/hostcb.c rename to test/misc/hostcb.c diff --git a/test/hostlib.c b/test/misc/hostlib.c similarity index 100% rename from test/hostlib.c rename to test/misc/hostlib.c diff --git a/test/iffparsewrite.c b/test/misc/iffparsewrite.c similarity index 100% rename from test/iffparsewrite.c rename to test/misc/iffparsewrite.c diff --git a/test/ilbmtoc.c b/test/misc/ilbmtoc.c similarity index 100% rename from test/ilbmtoc.c rename to test/misc/ilbmtoc.c diff --git a/test/ilbmtoc_image.c b/test/misc/ilbmtoc_image.c similarity index 100% rename from test/ilbmtoc_image.c rename to test/misc/ilbmtoc_image.c diff --git a/test/inquire.c b/test/misc/inquire.c similarity index 100% rename from test/inquire.c rename to test/misc/inquire.c diff --git a/test/joystick.c b/test/misc/joystick.c similarity index 100% rename from test/joystick.c rename to test/misc/joystick.c diff --git a/test/mathffp.c b/test/misc/mathffp.c similarity index 100% rename from test/mathffp.c rename to test/misc/mathffp.c diff --git a/test/mathtest.c b/test/misc/mathtest.c similarity index 100% rename from test/mathtest.c rename to test/misc/mathtest.c diff --git a/test/misc/mmakefile.src b/test/misc/mmakefile.src new file mode 100644 index 0000000000..23fb13027b --- /dev/null +++ b/test/misc/mmakefile.src @@ -0,0 +1,32 @@ +# Copyright © 2016, The AROS Development Team. All rights reserved. +# $Id$ + +include $(TOP)/config/make.cfg + +FILES := \ + camdtree \ + fileseek \ + frequencies \ + fsresource \ + getcpuinfo \ + helloworld \ + hostcb \ + iffparsewrite \ + ilbmtoc \ + inquire \ + joystick \ + mathtest \ + partition \ + pthreadtest \ + unixio \ + versionlib + +EXEDIR := $(AROS_TESTS)/misc + +#MM- test : test-misc +#MM- test-quick : test-misc-quick + +%build_progs mmake=test-misc \ + files=$(FILES) targetdir=$(EXEDIR) uselibs="pthread" + +%common diff --git a/test/partition.c b/test/misc/partition.c similarity index 100% rename from test/partition.c rename to test/misc/partition.c diff --git a/test/pcilist.c b/test/misc/pcilist.c similarity index 100% rename from test/pcilist.c rename to test/misc/pcilist.c diff --git a/test/pthreadtest.c b/test/misc/pthreadtest.c similarity index 100% rename from test/pthreadtest.c rename to test/misc/pthreadtest.c diff --git a/test/true.c b/test/misc/true.c similarity index 100% rename from test/true.c rename to test/misc/true.c diff --git a/test/unixio.c b/test/misc/unixio.c similarity index 100% rename from test/unixio.c rename to test/misc/unixio.c diff --git a/test/versionlib.c b/test/misc/versionlib.c similarity index 100% rename from test/versionlib.c rename to test/misc/versionlib.c diff --git a/test/mmakefile.src b/test/mmakefile.src index 98397854b2..c8749dcbb5 100644 --- a/test/mmakefile.src +++ b/test/mmakefile.src @@ -6,40 +6,23 @@ include $(TOP)/config/make.cfg COMMONTESTFILES := \ - fileseek \ - frequencies \ - hostcb \ - iffparsewrite \ - ilbmtoc \ localetest \ modeid \ keymaptest \ - inquire \ - mathtest \ cctest \ - helloworld \ serialmousetest \ serialtest \ - unixio \ - partition \ - sortlayercr \ systemtags \ systemtagsslave \ - camdtree \ rexxsyslibtest \ printnativekeytable \ simplepng \ convertpixels \ patchrgbconv \ - joystick \ - getcpuinfo \ printf_f \ - versionlib \ runtests \ - fsresource \ mountlist \ - openlocale \ - pthreadtest + openlocale SHTESTFILES=\ pcilist \ @@ -61,7 +44,7 @@ USER_CFLAGS += -DADATE="\"$(shell date '+%d.%m.%Y')\"" %build_progs mmake=test-common \ files=$(COMMONTESTFILES) targetdir=$(EXEDIR) \ - uselibs="coolimagesstatic hiddstubs pthread" + uselibs="coolimagesstatic hiddstubs" %build_progs mmake=test-sh \ files=$(SHTESTFILES) targetdir=$(EXEDIR) \ diff --git a/test/testscript b/test/testscript index 2f62b6bc0e..ff5e76b987 100644 --- a/test/testscript +++ b/test/testscript @@ -1,7 +1,7 @@ # default test script for "runtests" utility/amiga2date printf_f -versionlib +misc/versionlib dos/addpart clib/abort clib/exit -- 2.11.4.GIT