This is an automated email from the ASF dual-hosted git repository.
xiaoxiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx-testing.git
The following commit(s) were added to refs/heads/master by this push:
new 0c4126b Split check testlist to enable multiple jobs in CI build
0c4126b is described below
commit 0c4126baae6b379d52d6e1e4590494ed05099580
Author: liuhaitao <[email protected]>
AuthorDate: Wed Mar 4 15:09:04 2020 +0800
Split check testlist to enable multiple jobs in CI build
In github action free version, up to 20 jobs could be run to speed up
CI build.
Signed-off-by: liuhaitao <[email protected]>
---
cibuild.sh | 30 ++++++++++++++++--------------
testlist/arm-01.dat | 11 +++++++++++
testlist/arm-02.dat | 9 +++++++++
testlist/arm-03.dat | 17 +++++++++++++++++
testlist/arm-04.dat | 12 ++++++++++++
testlist/arm-05.dat | 10 ++++++++++
testlist/arm-06.dat | 12 ++++++++++++
testlist/arm-07.dat | 8 ++++++++
testlist/arm-08.dat | 13 +++++++++++++
testlist/arm-09.dat | 22 ++++++++++++++++++++++
testlist/arm-10.dat | 18 ++++++++++++++++++
testlist/arm-11.dat | 10 ++++++++++
testlist/arm-12.dat | 11 +++++++++++
testlist/arm-13.dat | 10 ++++++++++
testlist/arm-14.dat | 7 +++++++
testlist/arm-15.dat | 12 ++++++++++++
testlist/checklist.dat | 32 --------------------------------
testlist/{fulllist.dat => full.dat} | 0
testlist/mips-riscv-x86.dat | 7 +++++++
testlist/sim.dat | 5 +++++
20 files changed, 210 insertions(+), 46 deletions(-)
diff --git a/cibuild.sh b/cibuild.sh
index 5c62c18..50f850c 100755
--- a/cibuild.sh
+++ b/cibuild.sh
@@ -129,15 +129,16 @@ function c-cache {
function usage {
echo ""
- echo "USAGE: $0 [-i] [-s] [-c] [-b <check|full>]"
+ echo "USAGE: $0 [-i] [-s] [-c] [-*] <testlist>"
echo " $0 -h"
echo ""
echo "Where:"
echo " -i install tools"
echo " -s setup repos"
echo " -c enable ccache"
- echo " -b <check|full> do check or full CI Job"
+ echo " -* support all options in testbuild.sh"
echo " -h will show this help test and terminate"
+ echo " <testlist> select testlist file"
echo ""
exit 1
}
@@ -172,13 +173,14 @@ function install_tools {
function run_builds {
local ncpus=`grep -c ^processor /proc/cpuinfo`
- local options="-j $ncpus"
+ options+="-j $ncpus"
- if [ "X$build" = "Xcheck" ]; then
- options="$options -x"
- fi
+ for build in $builds; do
+ local builddir=$(cd $(dirname $build) && pwd)
+ local buildfile=$(basename $build)
- $nuttx/tools/testbuild.sh $options $WD/testlist/${build}list.dat
+ $nuttx/tools/testbuild.sh $options $builddir/$buildfile
+ done
}
if [ -z "$1" ]; then
@@ -196,18 +198,18 @@ while [ ! -z "$1" ]; do
-c )
enable_ccache
;;
- -b )
- shift
- build="$1"
- run_builds
- break
- ;;
-s )
setup_repos
;;
+ -* )
+ options+="$1 "
+ ;;
* )
- usage
+ builds=$@
+ break
;;
esac
shift
done
+
+run_builds
diff --git a/testlist/arm-01.dat b/testlist/arm-01.dat
new file mode 100644
index 0000000..5358154
--- /dev/null
+++ b/testlist/arm-01.dat
@@ -0,0 +1,11 @@
+/arm/a1x,CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL
+
+/arm/am335x,CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL
+
+/arm/c5471,CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL
+
+/arm/cxd56xx,CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL
+
+/arm/dm320,CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL
+
+/arm/efm32,CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL
diff --git a/testlist/arm-02.dat b/testlist/arm-02.dat
new file mode 100644
index 0000000..b663e21
--- /dev/null
+++ b/testlist/arm-02.dat
@@ -0,0 +1,9 @@
+/arm/imx6,CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL
+
+/arm/imxrt,CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL
+-imxrt1050-evk:libcxxtest
+-imxrt1060-evk:libcxxtest
+
+/arm/kinetis,CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL
+
+/arm/kl,CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL
diff --git a/testlist/arm-03.dat b/testlist/arm-03.dat
new file mode 100644
index 0000000..a97c930
--- /dev/null
+++ b/testlist/arm-03.dat
@@ -0,0 +1,17 @@
+/arm/lc823450,CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL
+
+/arm/lpc17xx_40xx/lincoln60,CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL
+-lincoln60:thttpd-binfs
+
+/arm/lpc17xx_40xx/lpc4088-devkit,CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL
+
+/arm/lpc17xx_40xx/lpc4088-quickstart,CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL
+
+/arm/lpc17xx_40xx/lpcxpresso-lpc1768,CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL
+-lpcxpresso-lpc1768:thttpd
+
+/arm/lpc17xx_40xx/lx_cpu,CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL
+
+/arm/lpc17xx_40xx/mbed,CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL
+
+/arm/lpc17xx_40xx/mcb1700,CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL
diff --git a/testlist/arm-04.dat b/testlist/arm-04.dat
new file mode 100644
index 0000000..4c05239
--- /dev/null
+++ b/testlist/arm-04.dat
@@ -0,0 +1,12 @@
+/arm/lpc17xx_40xx/olimex-lpc1766stk,CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL
+-olimex-lpc1766stk:slip-httpd
+-olimex-lpc1766stk:thttpd-nxflat
+
+/arm/lpc17xx_40xx/open1788,CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL
+
+/arm/lpc17xx_40xx/pnev5180b,CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL
+
+/arm/lpc17xx_40xx/u-blox-c027,CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL
+
+/arm/lpc17xx_40xx/zkit-arm-1769,CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL
+-zkit-arm-1769:thttpd
diff --git a/testlist/arm-05.dat b/testlist/arm-05.dat
new file mode 100644
index 0000000..c033fd3
--- /dev/null
+++ b/testlist/arm-05.dat
@@ -0,0 +1,10 @@
+/arm/lpc214x,CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL
+
+/arm/lpc2378,CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL
+
+/arm/lpc31xx,CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL
+-ea3131:pgnsh
+
+/arm/lpc43xx,CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL
+
+/arm/lpc54xx,CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL
diff --git a/testlist/arm-06.dat b/testlist/arm-06.dat
new file mode 100644
index 0000000..4d12d41
--- /dev/null
+++ b/testlist/arm-06.dat
@@ -0,0 +1,12 @@
+/arm/max326xx,CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL
+
+/arm/moxart,CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL
+-moxa:nsh
+
+/arm/nrf52,CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL
+
+/arm/nuc1xx,CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL
+
+/arm/s32k1xx,CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL
+
+/arm/sam34,CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL
diff --git a/testlist/arm-07.dat b/testlist/arm-07.dat
new file mode 100644
index 0000000..3a63d34
--- /dev/null
+++ b/testlist/arm-07.dat
@@ -0,0 +1,8 @@
+/arm/sama5,CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL
+-sama5d3x-ek:nxwm
+-sama5d4-ek:dramboot
+-sama5d4-ek:elf
+
+/arm/samd2l2,CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL
+
+/arm/samd5e5,CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL
diff --git a/testlist/arm-08.dat b/testlist/arm-08.dat
new file mode 100644
index 0000000..bfa8923
--- /dev/null
+++ b/testlist/arm-08.dat
@@ -0,0 +1,13 @@
+/arm/samv7,CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL
+
+/arm/stm32/axoloti,CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL
+
+/arm/stm32/clicker2-stm32,CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL
+
+/arm/stm32/cloudctrl,CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL
+
+/arm/stm32/fire-stm32v2,CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL
+
+/arm/stm32/hymini-stm32v,CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL
+
+/arm/stm32/maple,CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL
diff --git a/testlist/arm-09.dat b/testlist/arm-09.dat
new file mode 100644
index 0000000..82ba869
--- /dev/null
+++ b/testlist/arm-09.dat
@@ -0,0 +1,22 @@
+/arm/stm32/mikroe-stm32f4,CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL
+-mikroe-stm32f4:fulldemo
+
+/arm/stm32/nucleo-f103rb,CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL
+
+/arm/stm32/nucleo-f207zg,CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL
+
+/arm/stm32/nucleo-f302r8,CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL
+
+/arm/stm32/nucleo-f303re,CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL
+
+/arm/stm32/nucleo-f303ze,CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL
+
+/arm/stm32/nucleo-f334r8,CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL
+
+/arm/stm32/nucleo-f410rb,CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL
+
+/arm/stm32/nucleo-f446re,CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL
+
+/arm/stm32/nucleo-f4x1re,CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL
+
+/arm/stm32/nucleo-l152re,CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL
diff --git a/testlist/arm-10.dat b/testlist/arm-10.dat
new file mode 100644
index 0000000..9a00010
--- /dev/null
+++ b/testlist/arm-10.dat
@@ -0,0 +1,18 @@
+/arm/stm32/olimex-stm32-e407,CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL
+
+/arm/stm32/olimex-stm32-h405,CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL
+
+/arm/stm32/olimex-stm32-h407,CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL
+
+/arm/stm32/olimex-stm32-p107,CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL
+
+/arm/stm32/olimex-stm32-p207,CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL
+
+/arm/stm32/olimex-stm32-p407,CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL
+-olimex-stm32-p407:kelf
+
+/arm/stm32/olimexino-stm32,CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL
+
+/arm/stm32/omnibusf4,CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL
+
+/arm/stm32/stm32butterfly2,CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL
diff --git a/testlist/arm-11.dat b/testlist/arm-11.dat
new file mode 100644
index 0000000..974e54d
--- /dev/null
+++ b/testlist/arm-11.dat
@@ -0,0 +1,10 @@
+/arm/stm32/photon,CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL
+
+/arm/stm32/shenzhou,CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL
+-shenzhou:thttpd
+
+/arm/stm32/stm3210e-eval,CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL
+
+/arm/stm32/stm3220g-eval,CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL
+
+/arm/stm32/stm3240g-eval,CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL
diff --git a/testlist/arm-12.dat b/testlist/arm-12.dat
new file mode 100644
index 0000000..b93dad8
--- /dev/null
+++ b/testlist/arm-12.dat
@@ -0,0 +1,11 @@
+/arm/stm32/stm32_tiny,CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL
+
+/arm/stm32/stm32f103-minimum,CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL
+
+/arm/stm32/stm32f334-disco,CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL
+
+/arm/stm32/stm32f3discovery,CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL
+
+/arm/stm32/stm32f411e-disco,CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL
+
+/arm/stm32/stm32f429i-disco,CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL
diff --git a/testlist/arm-13.dat b/testlist/arm-13.dat
new file mode 100644
index 0000000..2d8f223
--- /dev/null
+++ b/testlist/arm-13.dat
@@ -0,0 +1,10 @@
+/arm/stm32/stm32f4discovery,CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL
+-stm32f4discovery:cxxtest
+-stm32f4discovery:testlibcxx
+-stm32f4discovery:winbuild
+
+/arm/stm32/stm32ldiscovery,CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL
+
+/arm/stm32/stm32vldiscovery,CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL
+
+/arm/stm32/viewtool-stm32f107,CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL
diff --git a/testlist/arm-14.dat b/testlist/arm-14.dat
new file mode 100644
index 0000000..d3ac3a8
--- /dev/null
+++ b/testlist/arm-14.dat
@@ -0,0 +1,7 @@
+/arm/stm32f0l0g0,CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL
+
+/arm/stm32f7,CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL
+
+/arm/stm32h7,CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL
+
+/arm/str71x,CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL
diff --git a/testlist/arm-15.dat b/testlist/arm-15.dat
new file mode 100644
index 0000000..7a4d88f
--- /dev/null
+++ b/testlist/arm-15.dat
@@ -0,0 +1,12 @@
+/arm/stm32l4,CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL
+
+/arm/tiva,CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL
+-eagle100:nxflat
+-eagle100:thttpd
+-launchxl-cc1310:nsh
+-launchxl-tms57004:nsh
+
+/arm/tms570,CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL
+-tms570ls31x-usb-kit:nsh
+
+/arm/xmc4,CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL
diff --git a/testlist/checklist.dat b/testlist/checklist.dat
deleted file mode 100644
index a0d2e01..0000000
--- a/testlist/checklist.dat
+++ /dev/null
@@ -1,32 +0,0 @@
-/arm,CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL
--ea3131:pgnsh
--eagle100:nxflat
--eagle100:thttpd
--imxrt1050-evk:libcxxtest
--imxrt1060-evk:libcxxtest
--launchxl-cc1310:nsh
--launchxl-tms57004:nsh
--lincoln60:thttpd-binfs
--lpcxpresso-lpc1768:thttpd
--mikroe-stm32f4:fulldemo
--moxa:nsh
--olimex-lpc1766stk:slip-httpd
--olimex-lpc1766stk:thttpd-nxflat
--olimex-stm32-p407:kelf
--sama5d3x-ek:nxwm
--sama5d4-ek:dramboot
--sama5d4-ek:elf
--shenzhou:thttpd
--stm32f4discovery:cxxtest
--stm32f4discovery:testlibcxx
--stm32f4discovery:winbuild
--tms570ls31x-usb-kit:nsh
--zkit-arm-1769:thttpd
-
-/mips,CONFIG_MIPS32_TOOLCHAIN_PINGUINOL
-
-/sim
--sim:cxxtest
--sim:nxwm
--sim:rpproxy
--sim:rpserver
diff --git a/testlist/fulllist.dat b/testlist/full.dat
similarity index 100%
rename from testlist/fulllist.dat
rename to testlist/full.dat
diff --git a/testlist/mips-riscv-x86.dat b/testlist/mips-riscv-x86.dat
new file mode 100644
index 0000000..aa46c06
--- /dev/null
+++ b/testlist/mips-riscv-x86.dat
@@ -0,0 +1,7 @@
+/mips,CONFIG_MIPS32_TOOLCHAIN_PINGUINOL
+
+/risc-v,CONFIG_RV32IM_TOOLCHAIN_GNU_RVGL
+-gapuino:nsh
+-nr5m100-nexys4:nsh
+
+/x86
diff --git a/testlist/sim.dat b/testlist/sim.dat
new file mode 100644
index 0000000..17bb150
--- /dev/null
+++ b/testlist/sim.dat
@@ -0,0 +1,5 @@
+/sim
+-sim:cxxtest
+-sim:nxwm
+-sim:rpproxy
+-sim:rpserver
