Fix build (ARMmbed#117)

* fix CI config typo * remove extra endif * remote un-needed header file * change test configs
adbridge · May 27, 2020 · 487c8e5 · 487c8e5
1 parent b988451
commit 487c8e5
Show file tree

Hide file tree

Showing 4 changed files with 44 additions and 43 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -9,20 +9,20 @@ jobs:
       - image: mbedos/mbed-os-env:stable
     steps:
       - checkout:
-          path: sinppet/TESTS
+          path: snippet/TESTS
 
       ### Repo structure Tests ###
       - run:
           name: Repo structure Tests
           command: |
-            cd sinppet/TESTS
+            cd snippet/TESTS
             python3 .circleci/repo_checks.py
 
       ### Astyle Tests ###
       - run:
           name: Astyle Tests
           command: |
-            cd sinppet/TESTS
+            cd snippet/TESTS
             wget https://github.com/ARMmbed/mbed-os/raw/master/.astylerc
             git --no-pager diff --name-only --diff-filter=dr $(git merge-base --fork-point origin/master) HEAD | ( grep '.\(c\|cpp\|h\|hpp\)$' || true ) | while read file; do astyle -n --options=.astylerc "${file}"; done
             git diff --exit-code --diff-filter=dr --color
@@ -31,7 +31,7 @@ jobs:
       - run:
           name: Checkout mbed OS and libraries
           command: |
-            mv sinppet/TESTS/mbed-os.lib .
+            mv snippet/TESTS/mbed-os.lib .
             git clone https://github.com/ARMmbed/mbed-os.git mbed-os
             mbed config root .
             mbed update
@@ -40,4 +40,4 @@ jobs:
       - run:
           name: Compile Tests
           command: |
-            mbed test --compile -m K64F -t GCC_ARM -n sinppet-* --app-config=sinppet/TESTS/test.json -v
+            mbed test --compile -m K64F -t GCC_ARM -n snippet-* --app-config=snippet/TESTS/test.json -v
diff --git a/APIs_Drivers/CAN_ex_1/main.cpp b/APIs_Drivers/CAN_ex_1/main.cpp
@@ -47,4 +47,3 @@ int main()
     }
 }
 
-#endif
diff --git a/APIs_NetworkSocket/TCPServer/main.cpp b/APIs_NetworkSocket/TCPServer/main.cpp
@@ -4,7 +4,6 @@
  */
 #include "mbed.h"
 #include "EthernetInterface.h"
-#include "TCPServer.h"
 #include "TCPSocket.h"
 
 int main()

diff --git a/test.json b/test.json
@@ -1,40 +1,43 @@
 {
-	"config": {
-		"UART1_TX": "D1",
-		"UART1_RX": "D0",
-		"UART2_TX": "USBTX",
-		"UART2_RX": "USBRX",
-		"wifi-ssid": {
-			"help": "WiFi SSID",
-			"value": "\"SSID\""
-		},
-		"wifi-password": {
-			"help": "WiFi Password",
-			"value": "\"Password\""
+    "config": {
+        "UART1_TX": "D1",
+        "UART1_RX": "D0",
+        "UART2_TX": "USBTX",
+        "UART2_RX": "USBRX",
+        "wifi-ssid": {
+            "help": "WiFi SSID",
+            "value": "\"SSID\""
+        },
+        "wifi-password": {
+            "help": "WiFi Password",
+            "value": "\"Password\""
+        },
+        "sock-type": "TCP",
+        "echo-server-hostname": {
+            "help": "Echo server host name.",
+            "value": "\"echo.mbedcloudtesting.com\""
+        },
+        "echo-server-port": {
+            "help": "Echo server port number.",
+            "value": 7
+        },
+        "trace-level": {
+            "help": "Options are TRACE_LEVEL_ERROR,TRACE_LEVEL_WARN,TRACE_LEVEL_INFO,TRACE_LEVEL_DEBUG",
+            "macro_name": "MBED_TRACE_MAX_LEVEL",
+            "value": "TRACE_LEVEL_INFO"
+        }
     },
-		"sock-type": "TCP",
-		"echo-server-hostname": {
-			"help": "Echo server host name.",
-			"value": "\"echo.mbedcloudtesting.com\""
-    },
-		"echo-server-port": {
-			"help": "Echo server port number.",
-			"value": 7
-    },
-		"trace-level": {
-			"help": "Options are TRACE_LEVEL_ERROR,TRACE_LEVEL_WARN,TRACE_LEVEL_INFO,TRACE_LEVEL_DEBUG",
-			"macro_name": "MBED_TRACE_MAX_LEVEL",
-			"value": "TRACE_LEVEL_INFO"
+    "target_overrides": {
+        "*":{
+            "platform.callback-nontrivial" : "true"
+        },
+        "K64F":{
+            "target.components_add" : ["SPIF"],
+            "spif-driver.SPI_MOSI"  : "D11", 
+            "spif-driver.SPI_MISO"  : "D12",
+            "spif-driver.SPI_CLK"   : "D13",
+            "spif-driver.SPI_CS"    : "D10",
+            "target.components_add": ["DATAFLASH"]
+        }
     }
-	},
-	"target_overrides": {
-		"K64F":{
-			"target.components_add" : ["SPIF"],
-			"spif-driver.SPI_MOSI"  : "D11", 
-			"spif-driver.SPI_MISO"  : "D12",
-			"spif-driver.SPI_CLK"   : "D13",
-			"spif-driver.SPI_CS"    : "D10",
-			"target.components_add": ["DATAFLASH"]
-		}
-	}
 }