Use fully-featured config file when the testsuite is enabled on the nuttx target. (#1219)

Using `.config.alloptions` since it contains all the features that IoT.js requires.
Restored `.config.travis` to the original state (modified in #1207).

IoT.js-DCO-1.0-Signed-off-by: Robert Sipka [email protected]

Author: robertsipka

config/nuttx/stm32f4dis/.config.alloptions

@@ -1181,7 +1181,7 @@ CONFIG_FAT_MAXFNAME=32
 # CONFIG_FAT_DIRECT_RETRY is not set
 # CONFIG_NFS is not set
 # CONFIG_FS_NXFFS is not set
-# CONFIG_FS_ROMFS is not set
+CONFIG_FS_ROMFS=y
 # CONFIG_FS_TMPFS is not set
 # CONFIG_FS_SMARTFS is not set
 # CONFIG_FS_BINFS is not set
@@ -1444,7 +1444,7 @@ CONFIG_NSH_LIBRARY=y
 #
 CONFIG_NSH_READLINE=y
 # CONFIG_NSH_CLE is not set
-CONFIG_NSH_LINELEN=64
+CONFIG_NSH_LINELEN=128
 # CONFIG_NSH_DISABLE_SEMICOLON is not set
 CONFIG_NSH_CMDPARMS=y
 CONFIG_NSH_MAXARGUMENTS=6
@@ -1527,6 +1527,19 @@ CONFIG_NSH_FILEIOSIZE=512
 # CONFIG_NSH_DISABLESCRIPT is not set
 # CONFIG_NSH_DISABLE_ITEF is not set
 # CONFIG_NSH_DISABLE_LOOPS is not set
+CONFIG_NSH_ROMFSETC=y
+# CONFIG_NSH_ROMFSRC is not set
+CONFIG_NSH_ROMFSMOUNTPT="/test"
+CONFIG_NSH_INITSCRIPT="init.d/rcS"
+CONFIG_NSH_ROMFSDEVNO=0
+CONFIG_NSH_ROMFSSECTSIZE=64
+CONFIG_NSH_DEFAULTROMFS=y
+# CONFIG_NSH_ARCHROMFS is not set
+# CONFIG_NSH_CUSTOMROMFS is not set
+CONFIG_NSH_FATDEVNO=1
+CONFIG_NSH_FATSECTSIZE=512
+CONFIG_NSH_FATNSECTORS=1024
+CONFIG_NSH_FATMOUNTPT="/tmp"
 
 #
 # Console Configuration

config/nuttx/stm32f4dis/.config.travis

@@ -847,7 +847,7 @@ CONFIG_NETDEVICES=y
 #
 # CONFIG_NETDEV_LOOPBACK is not set
 # CONFIG_NETDEV_TELNET is not set
-CONFIG_NETDEV_MULTINIC=y
+# CONFIG_NETDEV_MULTINIC is not set
 # CONFIG_ARCH_HAVE_NETDEV_STATISTICS is not set
 CONFIG_NETDEV_LATEINIT=y
 
@@ -1119,7 +1119,7 @@ CONFIG_FAT_MAXFNAME=32
 # CONFIG_FAT_DMAMEMORY is not set
 # CONFIG_FAT_DIRECT_RETRY is not set
 # CONFIG_FS_NXFFS is not set
-CONFIG_FS_ROMFS=y
+# CONFIG_FS_ROMFS is not set
 # CONFIG_FS_TMPFS is not set
 # CONFIG_FS_SMARTFS is not set
 # CONFIG_FS_BINFS is not set
@@ -1235,6 +1235,10 @@ CONFIG_HAVE_CXXINITIALIZE=y
 # Application Configuration
 #
 
+#
+# NxWidgets/NxWM
+#
+
 #
 # Built-In Applications
 #
@@ -1274,10 +1278,10 @@ CONFIG_BUILTIN_PROXY_STACKSIZE=1024
 CONFIG_EXAMPLES_NSH=y
 CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
 # CONFIG_EXAMPLES_NULL is not set
+# CONFIG_EXAMPLES_NX is not set
 # CONFIG_EXAMPLES_NXFFS is not set
 # CONFIG_EXAMPLES_NXHELLO is not set
 # CONFIG_EXAMPLES_NXIMAGE is not set
-# CONFIG_EXAMPLES_NX is not set
 # CONFIG_EXAMPLES_NXLINES is not set
 # CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXTEXT is not set
@@ -1289,7 +1293,6 @@ CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
 # CONFIG_EXAMPLES_PWM is not set
 # CONFIG_EXAMPLES_RFID_READUID is not set
 # CONFIG_EXAMPLES_RGBLED is not set
-# CONFIG_EXAMPLES_ROMFS is not set
 # CONFIG_EXAMPLES_SENDMAIL is not set
 # CONFIG_EXAMPLES_SERIALBLASTER is not set
 # CONFIG_EXAMPLES_SERIALRX is not set
@@ -1300,11 +1303,9 @@ CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
 # CONFIG_EXAMPLES_SMP is not set
 # CONFIG_EXAMPLES_TCPECHO is not set
 # CONFIG_EXAMPLES_TELNETD is not set
-# CONFIG_EXAMPLES_THTTPD is not set
 # CONFIG_EXAMPLES_TIFF is not set
 # CONFIG_EXAMPLES_TOUCHSCREEN is not set
 # CONFIG_EXAMPLES_UDGRAM is not set
-# CONFIG_EXAMPLES_UNIONFS is not set
 # CONFIG_EXAMPLES_USBSERIAL is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_USTREAM is not set
@@ -1453,19 +1454,6 @@ CONFIG_NSH_FILEIOSIZE=512
 # CONFIG_NSH_DISABLESCRIPT is not set
 # CONFIG_NSH_DISABLE_ITEF is not set
 # CONFIG_NSH_DISABLE_LOOPS is not set
-CONFIG_NSH_ROMFSETC=y
-# CONFIG_NSH_ROMFSRC is not set
-CONFIG_NSH_ROMFSMOUNTPT="/test"
-CONFIG_NSH_INITSCRIPT="init.d/rcS"
-CONFIG_NSH_ROMFSDEVNO=0
-CONFIG_NSH_ROMFSSECTSIZE=64
-CONFIG_NSH_DEFAULTROMFS=y
-# CONFIG_NSH_ARCHROMFS is not set
-# CONFIG_NSH_CUSTOMROMFS is not set
-CONFIG_NSH_FATDEVNO=1
-CONFIG_NSH_FATSECTSIZE=512
-CONFIG_NSH_FATNSECTORS=1024
-CONFIG_NSH_FATMOUNTPT="/tmp"
 
 #
 # Console Configuration
@@ -1496,10 +1484,6 @@ CONFIG_NSH_MAX_ROUNDTRIP=20
 # CONFIG_NSH_LOGIN is not set
 # CONFIG_NSH_CONSOLE_LOGIN is not set
 
-#
-# NxWidgets/NxWM
-#
-
 #
 # Platform-specific Support
 #

tools/precommit.py

@@ -309,6 +309,14 @@ def generate_nuttx_romfs(nuttx_root):
 
                 if option.enable_testsuite:
                     generate_nuttx_romfs(nuttx_root)
+                    fs.chdir(fs.join(nuttx_root, 'nuttx'))
+                    fs.copy(fs.join(path.PROJECT_ROOT,
+                                    'config',
+                                    'nuttx',
+                                    'stm32f4dis',
+                                    '.config.alloptions'),
+                            '.config')
+                    fs.chdir(path.PROJECT_ROOT)
 
                 build_nuttx(nuttx_root, buildtype, 'context')
                 build(buildtype, ['--target-arch=arm',