Consolidate how we have build/configure/test commands (project-chip#473)

* Cleaning these up * Cleaning these up * Cleaning up travis * adding build scripts (oops gitignore) * Fixing and updating travis * Adding mbedTLS tests * Fixing formatting * Fixing build * Trying again
mspang · Apr 23, 2020 · 6196e61 · 6196e61
1 parent b97ab60
commit 6196e61
Show file tree

Hide file tree

Showing 22 changed files with 109 additions and 94 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,3 @@
-
 # VS Code Configs
 .vscode/*
 !.vscode/tasks.json
@@ -13,7 +12,7 @@ Makefile.in
 aclocal.m4
 autom4te.cache
 output/
-build/
+/build/
 examples/**/build
 config.log
 config.status

diff --git a/.travis.yml b/.travis.yml
@@ -2,45 +2,39 @@ language: minimal
 
 branches:
     except:
-    - /^restyled.*$/
-
-services:
-  - docker
+        - /^restyled.*$/
 
-before_install:
-- ./integrations/ci-tools/pre_build.sh
+services:
+    - docker
 
 script:
-- ./integrations/ci-tools/build.sh
-
-after_success:
-- ./integrations/ci-tools/post_build_success.sh
+    - ./integrations/ci-tools/build.sh
 
 # Note: To add new job types, add it to the matrix below, with a unique TASK varable, then update the build.sh to do what you want during that task
 
 jobs:
-  include:
-    - stage: Build
-      name: "Build Ubuntu Linux Xenial LTS"
-      env: TASK="build-ubuntu-linux"
-    - stage: Build
-      name: "Build NRF Example Lock App"
-      env: TASK="build-nrf-example-lock-app"
-    - stage: Tests
-      name: "Unit & Functional Tests"
-      env: TASK="run-unit-and-functional-tests"
-    - stage: Tests
-      name: "Crypto Tests"
-      env: TASK="run-crypto-tests"
-    - stage: Tests
-      name: "Setup Payload Tests"
-      env: TASK="run-setup-payload-tests"
-    - stage: Tests
-      name: "mbedTLS Crypto Tests"
-      env: TASK="run-mbedtls-crypto-tests"
-    - stage: Deployment Checks
-      name: "Run Code Coverage"
-      env: TASK="run-code-coverage"
-    - stage: Deployment Checks
-      name: "Distribution Check"
-      env: TASK="build-distribution-check"
+    include:
+        - stage: Build
+          name: "Build Ubuntu Linux Xenial LTS"
+          env: TASK="build-ubuntu-linux"
+        - stage: Build
+          name: "Build NRF Example Lock App"
+          env: TASK="build-nrf-example-lock-app"
+        - stage: Tests
+          name: "Unit & Functional Tests"
+          env: TASK="run-unit-and-functional-tests"
+        - stage: Tests
+          name: "Crypto Tests"
+          env: TASK="run-crypto-tests"
+        - stage: Tests
+          name: "Setup Payload Tests"
+          env: TASK="run-setup-payload-tests"
+        # - stage: Tests
+        #   name: "mbedTLS Crypto Tests"
+        #   env: TASK="run-mbedtls-crypto-tests"
+        - stage: Deployment Checks
+          name: "Run Code Coverage"
+          env: TASK="run-code-coverage"
+        - stage: Deployment Checks
+          name: "Distribution Check"
+          env: TASK="build-distribution-check"
diff --git a/.vscode/tasks.json b/.vscode/tasks.json
@@ -4,7 +4,7 @@
         {
             "label": "Main Build",
             "type": "shell",
-            "command": "make -C build/default",
+            "command": "scripts/build/default.sh",
             "group": {
                 "kind": "build",
                 "isDefault": true
@@ -20,7 +20,7 @@
         {
             "label": "Auto-enforce coding style",
             "type": "shell",
-            "command": "make -C build/default pretty",
+            "command": "scripts/helpers/auto_enforce_code_style.sh",
             "group": "none",
             "dependsOn": "Bootstrap",
             "isBackground": false,
@@ -33,107 +33,86 @@
         {
             "label": "Verify coding style conformance",
             "type": "shell",
-            "command": "make -C build/default pretty-check",
+            "command": "scripts/helpers/code_style_check.sh",
             "group": "none",
             "dependsOn": "Bootstrap",
             "problemMatcher": ["$gcc"]
         },
         {
             "label": "Run Unit and Functional Tests",
             "type": "shell",
-            "command": "make -C build/default check",
+            "command": "scripts/test/all_tests.sh",
             "group": "none",
             "dependsOn": "Bootstrap",
             "problemMatcher": ["$gcc"]
         },
         {
             "label": "Run Distribution Generation",
             "type": "shell",
-            "command": "make -C build/default distcheck",
+            "command": "scripts/build/distribution_check.sh",
             "group": "none",
             "dependsOn": "Bootstrap",
             "problemMatcher": ["$gcc"]
         },
         {
             "label": "Run Code Coverage",
             "type": "shell",
-            "command": "make -C build/default coverage; code -r build/default/src/chip.info/index.html",
+            "command": "scripts/tools/codecoverage.sh; code -r build/default/src/chip.info/index.html",
             "group": "none",
             "dependsOn": "Bootstrap",
             "problemMatcher": ["$gcc"]
         },
         {
             "label": "Clean",
             "type": "shell",
-            "command": "make -C build/default distclean",
+            "command": "scripts/helpers/clean.sh",
             "group": "none",
             "dependsOn": "Bootstrap",
             "problemMatcher": ["$gcc"]
         },
-        {
-            "label": "Configure",
-            "type": "shell",
-            "command": "mkdir -p build/default && (cd build/default && ../../bootstrap-configure --enable-debug --enable-coverage)",
-            "group": "none",
-            "problemMatcher": ["$gcc"]
-        },
         {
             "label": "Bootstrap",
             "type": "shell",
-            "command": [
-                "if [[ ! -f build/default/config.status ]]; then",
-                "  mkdir -p build/default;",
-                "  (cd build/default && ",
-                "  ../../bootstrap-configure --enable-debug --enable-coverage); ",
-                "elif [[ configure.ac -nt configure ]]; then",
-                "  ./bootstrap",
-                "else",
-                "  ./bootstrap -w make;",
-                "fi"
-            ],
+            "command": "scripts/build/bootstrap.sh",
             "group": "none",
             "problemMatcher": ["$gcc"]
         },
         {
             "label": "Clean Tree",
             "type": "shell",
-            "command": "make -f Makefile-bootstrap clean-repos && git clean -Xdf",
+            "command": "scripts/helpers/clean_tree.sh",
             "group": "none",
             "problemMatcher": ["$gcc"]
         },
         {
             "label": "Run Setup Payload Tests",
             "type": "shell",
-            "command": "make -C build/default/src/setup_payload check",
+            "command": "scripts/tests/setup_payload_tests.sh",
             "group": "none",
             "dependsOn": "Bootstrap",
             "problemMatcher": ["$gcc"]
         },
         {
             "label": "Build & Run Crypto Tests",
             "type": "shell",
-            "command": "make -C build/default/src/crypto check",
+            "command": "scripts/tests/crypt_tests.sh",
             "group": "none",
             "problemMatcher": ["$gcc"]
         },
         {
             "label": "Build nRF5 Lock App",
             "type": "shell",
-            "command": "make -C examples/lock-app/nrf5",
+            "command": "scripts/examples/nrf_lock_app.sh",
             "group": "none",
             "dependsOn": "Clean Tree",
-            "problemMatcher": [
-                "$gcc"
-            ]
+            "problemMatcher": ["$gcc"]
         },
         {
             "label": "Build openSSL crypto Tests",
             "type": "shell",
-            "command": " make -C build/default/src/crypto/ && make -C build/default/src/crypto/tests/ TestOpenSSLCrypto",
+            "command": "scripts/tests/openssl_tests.sh",
             "group": "none",
-            "problemMatcher": [
-                "$gcc"
-            ]
-        },
-    ],
+            "problemMatcher": ["$gcc"]
+        }
+    ]
 }
diff --git a/integrations/ci-tools/build.sh b/integrations/ci-tools/build.sh
@@ -24,13 +24,7 @@ die() {
 # move to ToT, I don't work anywhere else
 cd "$here/../.." || die 'ack!, where am I?!?'
 
-bootstrap='
-if [[ ! -f build/default/config.status ]]; then
-   mkdir -p build/default;
-   (cd build/default && ../../bootstrap-configure --enable-debug --enable-coverage);
-else
-   ./bootstrap -w make;
-fi'
+bootstrap='scripts/build/bootstrap.sh'
 
 bootstrap_mbedtls='
    git clean -xdf
@@ -65,44 +59,43 @@ case "$TASK" in
   #  a build inside our build container
   build-ubuntu-linux)
     docker_run_bash_command "$bootstrap"
-    docker_run_bash_command 'make V=1 -C build/default'
+    docker_run_bash_command 'scripts/build/default.sh'
     ;;
 
   build-nrf-example-lock-app)
-    docker_run_bash_command 'make VERBOSE=1 -C examples/lock-app/nrf5'
+    docker_run_bash_command 'scripts/examples/nrf_lock_app.sh'
     ;;
 
   build-distribution-check)
     docker_run_bash_command "$bootstrap"
-    docker_run_bash_command 'make V=1 -C build/default'
+    docker_run_bash_command 'scripts/build/distribution_check.sh'
     ;;
 
   run-unit-and-functional-tests)
     docker_run_bash_command "$bootstrap"
-    docker_run_bash_command 'make V=1 -C build/default distcheck'
+    docker_run_bash_command 'scripts/tests/all_tests.sh'
     ;;
 
   run-code-coverage)
     docker_run_bash_command "$bootstrap"
-    docker_run_bash_command 'make V=1 -C build/default coverage'
+    docker_run_bash_command 'scripts/tools/codecoverage.sh'
     docker_run_bash_command 'bash <(curl -s https://codecov.io/bash)'
     ;;
 
   run-crypto-tests)
     docker_run_bash_command "$bootstrap"
-    docker_run_bash_command 'make V=1 -C build/default/src/crypto check'
+    docker_run_bash_command 'scripts/tests/crypto_tests.sh'
     ;;
 
   run-setup-payload-tests)
     docker_run_bash_command "$bootstrap"
-    docker_run_bash_command 'make V=1 -C build/default/src/setup_payload check'
+    docker_run_bash_command 'scripts/tests/setup_payload_tests.sh'
     ;;
 
   run-mbedtls-crypto-tests)
     docker_run_bash_command "$bootstrap_mbedtls"
-    docker_run_bash_command 'make V=1 -C build/default/third_party/mbedtls'
-    docker_run_bash_command 'make V=1 -C build/default/src/crypto check'
-    docker_run_bash_command 'git clean -xdf'
+    docker_run_bash_command 'scripts/tests/mbedtls_tests.sh'
+    docker_run_bash_command 'scripts/tests/crypto_tests.sh'
     ;;
 
   *)

diff --git a/integrations/ci-tools/post_build_success.sh b/integrations/ci-tools/post_build_success.sh
diff --git a/integrations/ci-tools/pre_build.sh b/integrations/ci-tools/pre_build.sh
diff --git a/integrations/github/actions/clang-tidy/run_clang.sh b/integrations/github/actions/clang-tidy/run_clang.sh
diff --git a/scripts/build/bootstrap.sh b/scripts/build/bootstrap.sh
@@ -0,0 +1,13 @@
+#!/bin/bash
+
+# if [[ ! -f build/default/config.status ]]; then mkdir -p build/default; (cd build/default && ../../bootstrap-configure --enable-debug --enable-coverage); else ./bootstrap -w make; fi
+
+if [[ ! -f build/default/config.status ]]; then
+  mkdir -p build/default
+  (cd build/default &&
+    ../../bootstrap-configure --enable-debug --enable-coverage)
+elif [[ configure.ac -nt configure ]]; then
+  ./bootstrap
+else
+  ./bootstrap -w make
+fi
diff --git a/scripts/build/default.sh b/scripts/build/default.sh
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+make V=1 -C build/default
diff --git a/scripts/build/distribution_check.sh b/scripts/build/distribution_check.sh
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+make -C build/default distcheck
diff --git a/scripts/examples/nrf_lock_app.sh b/scripts/examples/nrf_lock_app.sh
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+make -C examples/lock-app/nrf5
diff --git a/scripts/helpers/auto_enforce_code_style.sh b/scripts/helpers/auto_enforce_code_style.sh
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+make -C build/default pretty
diff --git a/scripts/helpers/clean.sh b/scripts/helpers/clean.sh
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+make -C build/default distclean
diff --git a/scripts/helpers/clean_tree.sh b/scripts/helpers/clean_tree.sh
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+make -f Makefile-bootstrap clean-repos && git clean -Xdf
diff --git a/scripts/helpers/code_style_check.sh b/scripts/helpers/code_style_check.sh
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+make -C build/default pretty-check
diff --git a/scripts/tests/all_tests.sh b/scripts/tests/all_tests.sh
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+make -C build/default check
diff --git a/scripts/tests/crypto_tests.sh b/scripts/tests/crypto_tests.sh
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+make -C build/default/src/crypto check
diff --git a/scripts/tests/mbedtls_tests.sh b/scripts/tests/mbedtls_tests.sh
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+make V=1 -C build/default/third_party/mbedtls
diff --git a/scripts/tests/openssl_tests.sh b/scripts/tests/openssl_tests.sh
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+make -C build/default/src/crypto/ && make -C build/default/src/crypto/tests/ TestOpenSSLCrypto
diff --git a/scripts/tests/setup_payload_tests.sh b/scripts/tests/setup_payload_tests.sh
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+make -C build/default/src/setup_payload check
diff --git a/scripts/tools/codecoverage.sh b/scripts/tools/codecoverage.sh
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+make -C build/default coverage
diff --git a/third_party/nlbuild-autotools/repo/third_party/autoconf/ltmain.sh b/third_party/nlbuild-autotools/repo/third_party/autoconf/ltmain.sh