Merge pull request #37 from xiaoxiang781216/master
cibuild improvement
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 625ca99..350a047 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -72,7 +72,7 @@
with:
run: |
cd testing
- ./cibuild.sh -x -G testlist/${{matrix.boards}}.dat
+ ./cibuild.sh -x testlist/${{matrix.boards}}.dat
macOS:
runs-on: macos-10.15
@@ -119,4 +119,4 @@
- name: Run builds
run: |
cd testing
- ./cibuild.sh -i -x -G testlist/${{matrix.boards}}.dat
+ ./cibuild.sh -i -x testlist/${{matrix.boards}}.dat
diff --git a/cibuild.sh b/cibuild.sh
index c06f4bb..d84a46a 100755
--- a/cibuild.sh
+++ b/cibuild.sh
@@ -16,7 +16,8 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-set -e -x
+
+set -e
WD=$(cd $(dirname $0) && pwd)
nuttx=$WD/../nuttx
diff --git a/testlist/all.dat b/testlist/all.dat
index d150249..186913c 100644
--- a/testlist/all.dat
+++ b/testlist/all.dat
@@ -6,15 +6,10 @@
-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
@@ -31,9 +26,6 @@
/sim
-sim:cxxtest
--sim:nxwm
--sim:rpproxy
--sim:rpserver
/x86
diff --git a/testlist/arm-03.dat b/testlist/arm-03.dat
index 8dcc9b5..8e92ab6 100644
--- a/testlist/arm-03.dat
+++ b/testlist/arm-03.dat
@@ -1,5 +1,4 @@
/arm/lpc17xx_40xx,CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL
--lincoln60:thttpd-binfs
-lpcxpresso-lpc1768:thttpd
-olimex-lpc1766stk:slip-httpd
-olimex-lpc1766stk:thttpd-nxflat
diff --git a/testlist/arm-05.dat b/testlist/arm-05.dat
index 1390236..0e5f541 100644
--- a/testlist/arm-05.dat
+++ b/testlist/arm-05.dat
@@ -3,6 +3,4 @@
/arm/sam34,CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL
/arm/sama5,CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL
--sama5d3x-ek:nxwm
--sama5d4-ek:dramboot
-sama5d4-ek:elf
diff --git a/testlist/arm-07.dat b/testlist/arm-07.dat
index 922ff7d..969692e 100644
--- a/testlist/arm-07.dat
+++ b/testlist/arm-07.dat
@@ -1,7 +1,6 @@
/arm/stm32/maple,CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL
/arm/stm32/mikroe-stm32f4,CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL
--mikroe-stm32f4:fulldemo
/arm/stm32/nucleo-f103rb,CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL
diff --git a/testlist/arm-08.dat b/testlist/arm-08.dat
index 4821e0d..773b1a2 100644
--- a/testlist/arm-08.dat
+++ b/testlist/arm-08.dat
@@ -11,7 +11,6 @@
/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/omnibusf4,CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL
diff --git a/testlist/sim.dat b/testlist/sim.dat
index ce45887..9cdcfd7 100644
--- a/testlist/sim.dat
+++ b/testlist/sim.dat
@@ -1,17 +1,15 @@
/sim
-sim:cxxtest
--sim:nxwm
--sim:rpproxy
--sim:rpserver
-
-# X11
-# macOS doesn't have X11
--sim:nxlines
--sim:touchscreen
--sim:nx11
--sim:nsh2
# CONFIG_SIM_M32=y
# The recent versions of macOS is 64-bit only
-sim:loadable
-sim:module32
+
+# X11
+# macOS doesn't have X11
+-sim:nsh2
+-sim:nx11
+-sim:nxlines
+-sim:nxwm
+-sim:touchscreen
