Subject: |
[Merge] lp:~epics-base-testing/epics-base/base-tests into lp:epics-base |
From: |
Jonathan Thompson <[email protected]> |
To: |
[email protected] |
Date: |
Fri, 30 Jul 2010 12:24:48 -0000 |
Jonathan Thompson has proposed merging lp:~epics-base-testing/epics-base/base-tests into lp:epics-base.
Requested reviews:
EPICS Core Developers (epics-core)
Additions to make files that create test case information files that allow the automatic regression test system to find the test cases to be run. Merging these to trunk will allow the automatic regression test system to be run on trunk.
--
https://code.launchpad.net/~epics-base-testing/epics-base/base-tests/+merge/31370
Your team EPICS Core Developers is requested to review the proposed merge of lp:~epics-base-testing/epics-base/base-tests into lp:epics-base.
=== modified file 'configure/RULES_BUILD'
--- configure/RULES_BUILD 2010-07-29 19:58:14 +0000
+++ configure/RULES_BUILD 2010-07-30 12:24:48 +0000
@@ -89,6 +89,13 @@
PRODTARGETS += $(PRODNAME) $(MUNCHNAME) $(CTDT_SRCS) $(CTDT_OBJS) $(NMS)
#---------------------------------------------------------------
+# Generate a test specification if any tests are defined.
+#
+ifneq (,$(strip $(TESTS)))
+TARGETS+=testspec
+endif
+
+#---------------------------------------------------------------
# Libraries
#
@@ -315,6 +322,13 @@
runtests: $(TESTSCRIPTS_$(BUILD_CLASS))
-$(PERL) -MTest::Harness -e 'runtests @ARGV if @ARGV;' $^
+testspec: $(TESTSCRIPTS_$(BUILD_CLASS))
+ @$(RM) $@
+ @echo OS-class: $(OS_CLASS) > $@
+ @echo Target-arch: $(T_A) >> $@
+ @echo Tests: $^ >> $@
+ $(if $(TESTSPEC_$(OS_CLASS)), @echo "Harness: $(TESTSPEC_$(OS_CLASS))" >> $@)
+
# If there's a perl test script (.plt) available, use it
%.t: ../%.plt
@$(RM) $@
=== modified file 'src/libCom/test/Makefile'
--- src/libCom/test/Makefile 2010-05-05 20:43:58 +0000
+++ src/libCom/test/Makefile 2010-07-30 12:24:48 +0000
@@ -142,11 +142,12 @@
PROD_vxWorks = vxTestHarness
vxTestHarness_SRCS += $(testHarness_SRCS)
vxTestHarness_OBJS += $(INSTALL_BIN)/vxComLibrary
+TESTSPEC_vxWorks = vxTestHarness.munch; epicsRunLibComTests
PROD_RTEMS += rtemsTestHarness
rtemsTestHarness_SRCS += rtemsTestHarness.c
rtemsTestHarness_SRCS += $(testHarness_SRCS)
-
+TESTSPEC_RTEMS = rtemsTestHarness.boot; epicsRunLibComTests
TESTSCRIPTS_HOST += $(TESTS:%=%.t)
- Navigate by Date:
- Prev:
Re: [Merge] lp:~mdavidsaver/epics-base/devlib-pci into lp:epics-base mdavidsaver
- Next:
some issues with "lp:epics-base" in bazaar Jeff Hill
- Index:
2002
2003
2004
2005
2006
2007
2008
2009
<2010>
2011
2012
2013
2014
2015
2016
2017
2018
2019
2020
2021
2022
2023
2024
- Navigate by Thread:
- Prev:
Re: [Merge] lp:~mdavidsaver/epics-base/devlib-pci into lp:epics-base mdavidsaver
- Next:
some issues with "lp:epics-base" in bazaar Jeff Hill
- Index:
2002
2003
2004
2005
2006
2007
2008
2009
<2010>
2011
2012
2013
2014
2015
2016
2017
2018
2019
2020
2021
2022
2023
2024
|