-
-
Notifications
You must be signed in to change notification settings - Fork 345
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Add `HostTests` sample * Runs some tests against ArduinoJson6 and filesystem, asserts on failure * Remove related code from `LiveDebug` sample Travis * Move script into separate `build.sh` file * Use more recent linux distro (xenial vs. trusty) with less dated GCC - resolves conflict with `std::isnan` and `std::isinf` and stdc function declarations * Build and run `HostTests` sample Appveyor * Run mingw update/upgrade - default appveyor install is 5.3.0, current is 6.3.0 * Move build script into batch file * Add basic Host build and run `HostTests` sample
- Loading branch information
Showing
12 changed files
with
697 additions
and
218 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,41 @@ | ||
| REM Appveyor Windows build script | ||
|
|
||
| SET SMING_HOME=%APPVEYOR_BUILD_FOLDER%\Sming | ||
| SET ESP_HOME=c:\Espressif | ||
| SET PATH=%PATH%;%ESP_HOME%/utils | ||
| cd %SMING_HOME% | ||
| gcc -v | ||
|
|
||
| make help | ||
| make list-config | ||
|
|
||
| REM Compile the tools first | ||
| make tools V=1 || goto :error | ||
|
|
||
| IF "%SDK_VERSION%" == "2.0.0" ( | ||
| REM Build Host Emulator and run basic tests | ||
| set SMING_ARCH=Host | ||
| cd %SMING_HOME% | ||
| make STRICT=1 || goto :error | ||
| make Basic_Serial || goto :error | ||
| make Basic_ProgMem || goto :error | ||
| cd %SMING_HOME%\..\samples\HostTests | ||
| make flash || goto :error | ||
| ) | ||
|
|
||
| REM Build library and test sample apps | ||
| set SMING_ARCH=Esp8266 | ||
| cd %SMING_HOME% | ||
| make STRICT=1 || goto :error | ||
| cd %SMING_HOME%\..\samples\Basic_Blink | ||
| make V=1 || goto :error | ||
| cd %SMING_HOME%\..\samples\Basic_Ssl | ||
| make || goto :error | ||
| cd %SMING_HOME%\..\samples\Basic_SmartConfig | ||
| make || goto :error | ||
|
|
||
| goto :EOF | ||
|
|
||
| :error | ||
| echo Failed with error #%errorlevel%. | ||
| exit /b %errorlevel% |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,41 @@ | ||
| #!/bin/bash | ||
| set -e # exit with nonzero exit code if anything fails | ||
|
|
||
| env | ||
| unset SPIFFY | ||
| unset ESPTOOL2 | ||
|
|
||
| export SMING_HOME=$TRAVIS_BUILD_DIR/Sming | ||
| export ESP_HOME=$TRAVIS_BUILD_DIR/opt/esp-alt-sdk | ||
| if [ "$SDK_VERSION" = "3.0.0" ]; then | ||
| export SDK_BASE=$SMING_HOME/third-party/ESP8266_NONOS_SDK | ||
| fi | ||
|
|
||
| cd $SMING_HOME | ||
|
|
||
| export PATH=$PATH:$ESP_HOME/xtensa-lx106-elf/bin:$ESP_HOME/utils/:$SMING_HOME/../.travis/tools | ||
| if [ "$SDK_VERSION" = "2.0.0" ]; then | ||
| ../.travis/tools/clang/format-pr.sh; | ||
| fi | ||
|
|
||
| if [ "$SDK_VERSION" = "3.0.0" ]; then | ||
| export SMING_ARCH=Host | ||
| export STRICT=1 | ||
| make help | ||
| make list-config | ||
| make | ||
| make Basic_Blink Basic_DateTime Basic_Delegates Basic_Interrupts Basic_ProgMem Basic_Serial Basic_Servo LiveDebug DEBUG_VERBOSE_LEVEL=3 | ||
| cd ../samples/HostTests | ||
| make flash | ||
| cd $SMING_HOME | ||
| fi | ||
|
|
||
| export SMING_ARCH=Esp8266 | ||
| make help | ||
| make list-config | ||
| make STRICT=1 | ||
| make samples | ||
| make clean samples-clean | ||
| make ENABLE_CUSTOM_HEAP=1 STRICT=1 | ||
| make Basic_Blink ENABLE_CUSTOM_HEAP=1 DEBUG_VERBOSE_LEVEL=3 | ||
| make dist-clean; make HttpServer_ConfigNetwork ENABLE_CUSTOM_LWIP=2 STRICT=1 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,151 @@ | ||
| <?xml version="1.0" encoding="UTF-8" standalone="no"?> | ||
| <?fileVersion 4.0.0?><cproject storage_type_id="org.eclipse.cdt.core.XmlProjectDescriptionStorage"> | ||
| <storageModule moduleId="org.eclipse.cdt.core.settings"> | ||
| <cconfiguration id="cdt.managedbuild.toolchain.gnu.mingw.base.1135534147"> | ||
| <storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="cdt.managedbuild.toolchain.gnu.mingw.base.1135534147" moduleId="org.eclipse.cdt.core.settings" name="Sming"> | ||
| <externalSettings/> | ||
| <extensions> | ||
| <extension id="org.eclipse.cdt.core.ELF" point="org.eclipse.cdt.core.BinaryParser"/> | ||
| <extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/> | ||
| <extension id="org.eclipse.cdt.core.GASErrorParser" point="org.eclipse.cdt.core.ErrorParser"/> | ||
| <extension id="org.eclipse.cdt.core.GLDErrorParser" point="org.eclipse.cdt.core.ErrorParser"/> | ||
| <extension id="org.eclipse.cdt.core.GmakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/> | ||
| <extension id="org.eclipse.cdt.core.CWDLocator" point="org.eclipse.cdt.core.ErrorParser"/> | ||
| </extensions> | ||
| </storageModule> | ||
| <storageModule moduleId="cdtBuildSystem" version="4.0.0"> | ||
| <configuration artifactName="${ProjName}" buildProperties="" description="" id="cdt.managedbuild.toolchain.gnu.mingw.base.1135534147" name="Sming" parent="org.eclipse.cdt.build.core.emptycfg"> | ||
| <folderInfo id="cdt.managedbuild.toolchain.gnu.mingw.base.1135534147.86962463" name="/" resourcePath=""> | ||
| <toolChain id="cdt.managedbuild.toolchain.gnu.cross.base.1164554300" name="Cross GCC" superClass="cdt.managedbuild.toolchain.gnu.cross.base"> | ||
| <option id="cdt.managedbuild.option.gnu.cross.prefix.521205673" name="Prefix" superClass="cdt.managedbuild.option.gnu.cross.prefix"/> | ||
| <option id="cdt.managedbuild.option.gnu.cross.path.393887888" name="Path" superClass="cdt.managedbuild.option.gnu.cross.path"/> | ||
| <targetPlatform archList="all" binaryParser="org.eclipse.cdt.core.ELF" id="cdt.managedbuild.targetPlatform.gnu.cross.712123812" isAbstract="false" osList="all" superClass="cdt.managedbuild.targetPlatform.gnu.cross"/> | ||
| <builder id="cdt.managedbuild.builder.gnu.cross.2110485170" keepEnvironmentInBuildfile="false" managedBuildOn="false" name="Gnu Make Builder" superClass="cdt.managedbuild.builder.gnu.cross"/> | ||
| <tool id="cdt.managedbuild.tool.gnu.cross.c.compiler.1168221903" name="Cross GCC Compiler" superClass="cdt.managedbuild.tool.gnu.cross.c.compiler"> | ||
| <option id="gnu.c.compiler.option.include.paths.357494572" name="Include paths (-I)" superClass="gnu.c.compiler.option.include.paths" useByScannerDiscovery="false" valueType="includePath"> | ||
| <listOptionValue builtIn="false" value=""${SMING_HOME}""/> | ||
| <listOptionValue builtIn="false" value=""${SMING_HOME}/system/include""/> | ||
| <listOptionValue builtIn="false" value=""${SMING_HOME}/Libraries""/> | ||
| <listOptionValue builtIn="false" value=""${ESP_HOME}/sdk/include""/> | ||
| </option> | ||
| <inputType id="cdt.managedbuild.tool.gnu.c.compiler.input.313321806" superClass="cdt.managedbuild.tool.gnu.c.compiler.input"/> | ||
| </tool> | ||
| <tool id="cdt.managedbuild.tool.gnu.cross.cpp.compiler.1999763015" name="Cross G++ Compiler" superClass="cdt.managedbuild.tool.gnu.cross.cpp.compiler"> | ||
| <option id="gnu.cpp.compiler.option.include.paths.611746109" name="Include paths (-I)" superClass="gnu.cpp.compiler.option.include.paths" useByScannerDiscovery="false" valueType="includePath"> | ||
| <listOptionValue builtIn="false" value=""${SMING_HOME}""/> | ||
| <listOptionValue builtIn="false" value=""${SMING_HOME}/system/include""/> | ||
| <listOptionValue builtIn="false" value=""${SMING_HOME}/Libraries""/> | ||
| <listOptionValue builtIn="false" value=""${ESP_HOME}/sdk/include""/> | ||
| </option> | ||
| <inputType id="cdt.managedbuild.tool.gnu.cpp.compiler.input.1330530366" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.input"/> | ||
| </tool> | ||
| <tool id="cdt.managedbuild.tool.gnu.cross.c.linker.65193859" name="Cross GCC Linker" superClass="cdt.managedbuild.tool.gnu.cross.c.linker"/> | ||
| <tool id="cdt.managedbuild.tool.gnu.cross.cpp.linker.1795850540" name="Cross G++ Linker" superClass="cdt.managedbuild.tool.gnu.cross.cpp.linker"> | ||
| <inputType id="cdt.managedbuild.tool.gnu.cpp.linker.input.364843833" superClass="cdt.managedbuild.tool.gnu.cpp.linker.input"> | ||
| <additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/> | ||
| <additionalInput kind="additionalinput" paths="$(LIBS)"/> | ||
| </inputType> | ||
| </tool> | ||
| <tool id="cdt.managedbuild.tool.gnu.cross.archiver.525412186" name="Cross GCC Archiver" superClass="cdt.managedbuild.tool.gnu.cross.archiver"/> | ||
| <tool id="cdt.managedbuild.tool.gnu.cross.assembler.587940548" name="Cross GCC Assembler" superClass="cdt.managedbuild.tool.gnu.cross.assembler"> | ||
| <option id="gnu.both.asm.option.include.paths.1067006329" name="Include paths (-I)" superClass="gnu.both.asm.option.include.paths" valueType="includePath"> | ||
| <listOptionValue builtIn="false" value=""${SMING_HOME}""/> | ||
| <listOptionValue builtIn="false" value=""${SMING_HOME}/system/include""/> | ||
| <listOptionValue builtIn="false" value=""${SMING_HOME}/Libraries""/> | ||
| <listOptionValue builtIn="false" value=""${ESP_HOME}/sdk/include""/> | ||
| </option> | ||
| <inputType id="cdt.managedbuild.tool.gnu.assembler.input.651581712" superClass="cdt.managedbuild.tool.gnu.assembler.input"/> | ||
| </tool> | ||
| </toolChain> | ||
| </folderInfo> | ||
| </configuration> | ||
| </storageModule> | ||
| <storageModule moduleId="org.eclipse.cdt.core.externalSettings"/> | ||
| </cconfiguration> | ||
| </storageModule> | ||
| <storageModule moduleId="cdtBuildSystem" version="4.0.0"> | ||
| <project id="Basic_Blink.null.1347473968" name="Basic_Blink"/> | ||
| </storageModule> | ||
| <storageModule moduleId="org.eclipse.cdt.core.LanguageSettingsProviders"/> | ||
| <storageModule moduleId="refreshScope" versionNumber="2"> | ||
| <configuration configurationName="Sming"> | ||
| <resource resourceType="PROJECT" workspacePath="/Basic_Blink"/> | ||
| </configuration> | ||
| </storageModule> | ||
| <storageModule moduleId="org.eclipse.cdt.make.core.buildtargets"> | ||
| <buildTargets> | ||
| <target name="all" path="" targetID="org.eclipse.cdt.build.MakeTargetBuilder"> | ||
| <buildCommand>make</buildCommand> | ||
| <buildArguments>-f ${ProjDirPath}/Makefile</buildArguments> | ||
| <buildTarget>all</buildTarget> | ||
| <stopOnError>true</stopOnError> | ||
| <useDefaultCommand>true</useDefaultCommand> | ||
| <runAllBuilders>true</runAllBuilders> | ||
| </target> | ||
| <target name="clean" path="" targetID="org.eclipse.cdt.build.MakeTargetBuilder"> | ||
| <buildCommand>make</buildCommand> | ||
| <buildArguments>-f ${ProjDirPath}/Makefile</buildArguments> | ||
| <buildTarget>clean</buildTarget> | ||
| <stopOnError>true</stopOnError> | ||
| <useDefaultCommand>true</useDefaultCommand> | ||
| <runAllBuilders>true</runAllBuilders> | ||
| </target> | ||
| <target name="flash" path="" targetID="org.eclipse.cdt.build.MakeTargetBuilder"> | ||
| <buildCommand>make</buildCommand> | ||
| <buildArguments>-f ${ProjDirPath}/Makefile</buildArguments> | ||
| <buildTarget>flash</buildTarget> | ||
| <stopOnError>true</stopOnError> | ||
| <useDefaultCommand>true</useDefaultCommand> | ||
| <runAllBuilders>true</runAllBuilders> | ||
| </target> | ||
| <target name="flashonefile" path="" targetID="org.eclipse.cdt.build.MakeTargetBuilder"> | ||
| <buildCommand>make</buildCommand> | ||
| <buildArguments>-f ${ProjDirPath}/Makefile</buildArguments> | ||
| <buildTarget>flashonefile</buildTarget> | ||
| <stopOnError>true</stopOnError> | ||
| <useDefaultCommand>true</useDefaultCommand> | ||
| <runAllBuilders>true</runAllBuilders> | ||
| </target> | ||
| <target name="flashinit" path="" targetID="org.eclipse.cdt.build.MakeTargetBuilder"> | ||
| <buildCommand>make</buildCommand> | ||
| <buildArguments>-f ${ProjDirPath}/Makefile</buildArguments> | ||
| <buildTarget>flashinit</buildTarget> | ||
| <stopOnError>true</stopOnError> | ||
| <useDefaultCommand>true</useDefaultCommand> | ||
| <runAllBuilders>true</runAllBuilders> | ||
| </target> | ||
| <target name="flashboot" path="" targetID="org.eclipse.cdt.build.MakeTargetBuilder"> | ||
| <buildCommand>make</buildCommand> | ||
| <buildArguments>-f ${ProjDirPath}/Makefile</buildArguments> | ||
| <buildTarget>flashboot</buildTarget> | ||
| <stopOnError>true</stopOnError> | ||
| <useDefaultCommand>true</useDefaultCommand> | ||
| <runAllBuilders>true</runAllBuilders> | ||
| </target> | ||
| <target name="rebuild" path="" targetID="org.eclipse.cdt.build.MakeTargetBuilder"> | ||
| <buildCommand>make</buildCommand> | ||
| <buildArguments>-f ${ProjDirPath}/Makefile</buildArguments> | ||
| <buildTarget>rebuild</buildTarget> | ||
| <stopOnError>true</stopOnError> | ||
| <useDefaultCommand>true</useDefaultCommand> | ||
| <runAllBuilders>true</runAllBuilders> | ||
| </target> | ||
| </buildTargets> | ||
| </storageModule> | ||
| <storageModule moduleId="org.eclipse.cdt.internal.ui.text.commentOwnerProjectMappings"/> | ||
| <storageModule moduleId="scannerConfiguration"> | ||
| <autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/> | ||
| <scannerConfigBuildInfo instanceId="cdt.managedbuild.toolchain.gnu.mingw.base.1135534147;cdt.managedbuild.toolchain.gnu.mingw.base.1135534147.86962463;cdt.managedbuild.tool.gnu.c.compiler.mingw.base.2032390008;cdt.managedbuild.tool.gnu.c.compiler.input.1700912488"> | ||
| <autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/> | ||
| </scannerConfigBuildInfo> | ||
| <scannerConfigBuildInfo instanceId="cdt.managedbuild.toolchain.gnu.mingw.base.1135534147;cdt.managedbuild.toolchain.gnu.mingw.base.1135534147.86962463;cdt.managedbuild.tool.gnu.cross.c.compiler.1168221903;cdt.managedbuild.tool.gnu.c.compiler.input.313321806"> | ||
| <autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/> | ||
| </scannerConfigBuildInfo> | ||
| <scannerConfigBuildInfo instanceId="cdt.managedbuild.toolchain.gnu.mingw.base.1135534147;cdt.managedbuild.toolchain.gnu.mingw.base.1135534147.86962463;cdt.managedbuild.tool.gnu.cross.cpp.compiler.1999763015;cdt.managedbuild.tool.gnu.cpp.compiler.input.1330530366"> | ||
| <autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/> | ||
| </scannerConfigBuildInfo> | ||
| <scannerConfigBuildInfo instanceId="cdt.managedbuild.toolchain.gnu.mingw.base.1135534147;cdt.managedbuild.toolchain.gnu.mingw.base.1135534147.86962463;cdt.managedbuild.tool.gnu.cpp.compiler.mingw.base.454898447;cdt.managedbuild.tool.gnu.cpp.compiler.input.501261625"> | ||
| <autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/> | ||
| </scannerConfigBuildInfo> | ||
| </storageModule> | ||
| </cproject> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,28 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <projectDescription> | ||
| <name>HostTests</name> | ||
| <comment></comment> | ||
| <projects> | ||
| <project>SmingFramework</project> | ||
| </projects> | ||
| <buildSpec> | ||
| <buildCommand> | ||
| <name>org.eclipse.cdt.managedbuilder.core.genmakebuilder</name> | ||
| <triggers>clean,full,incremental,</triggers> | ||
| <arguments> | ||
| </arguments> | ||
| </buildCommand> | ||
| <buildCommand> | ||
| <name>org.eclipse.cdt.managedbuilder.core.ScannerConfigBuilder</name> | ||
| <triggers>full,incremental,</triggers> | ||
| <arguments> | ||
| </arguments> | ||
| </buildCommand> | ||
| </buildSpec> | ||
| <natures> | ||
| <nature>org.eclipse.cdt.core.cnature</nature> | ||
| <nature>org.eclipse.cdt.core.ccnature</nature> | ||
| <nature>org.eclipse.cdt.managedbuilder.core.managedBuildNature</nature> | ||
| <nature>org.eclipse.cdt.managedbuilder.core.ScannerConfigNature</nature> | ||
| </natures> | ||
| </projectDescription> |
Oops, something went wrong.