reduce number of targets to test the "weak" feature

Author: Jorge Aparicio

.travis.yml

@@ -30,20 +30,12 @@ matrix:
       os: linux
     - env: TARGET=powerpc64le-unknown-linux-gnu
       os: linux
-    - env: TARGET=thumbv6m-none-eabi
-      os: linux
     - env: TARGET=thumbv6m-none-eabi WEAK=true
       os: linux
-    - env: TARGET=thumbv7em-none-eabi
-      os: linux
     - env: TARGET=thumbv7em-none-eabi WEAK=true
       os: linux
-    - env: TARGET=thumbv7em-none-eabihf
-      os: linux
     - env: TARGET=thumbv7em-none-eabihf WEAK=true
       os: linux
-    - env: TARGET=thumbv7m-none-eabi
-      os: linux
     - env: TARGET=thumbv7m-none-eabi WEAK=true
       os: linux
     - env: TARGET=x86_64-apple-darwin

ci/script.sh

@@ -8,13 +8,8 @@ gist_it() {
 }
 
 build() {
-    if [[ $WEAK ]]; then
-        $CARGO build --features weak --target $TARGET
-        $CARGO build --features weak --target $TARGET --release
-    else
-        $CARGO build --target $TARGET
-        $CARGO build --target $TARGET --release
-    fi
+    $CARGO build --target $TARGET
+    $CARGO build --target $TARGET --release
 }
 
 inspect() {
@@ -23,24 +18,6 @@ inspect() {
     set +e
     $PREFIX$OBJDUMP -Cd target/**/release/*.rlib | gist_it
     set -e
-
-    # Check presence/absence of weak symbols
-    if [[ $WEAK ]]; then
-        local symbols=( memcmp memcpy memmove memset )
-        for symbol in "${symbols[@]}"; do
-            $PREFIX$NM target/$TARGET/debug/deps/librlibc-*.rlib | grep -q "W $symbol"
-        done
-    else
-        set +e
-        ls target/$TARGET/debug/deps/librlibc-*.rlib
-
-        if [[ $? == 0 ]]; then
-            exit 1
-        fi
-
-        set -e
-    fi
-
 }
 
 run_tests() {
@@ -68,6 +45,30 @@ c_test() {
     set -e
 }
 
+# Check presence/absence of weak symbols
+weak_test() {
+    if [[ $WEAK ]]; then
+        $CARGO clean
+
+        $CARGO build --features weak --target $TARGET
+        $CARGO build --features weak --target $TARGET --release
+
+        local symbols=( memcmp memcpy memmove memset )
+        for symbol in "${symbols[@]}"; do
+            $PREFIX$NM target/$TARGET/debug/deps/librlibc-*.rlib | grep -q "W $symbol"
+        done
+    else
+        set +e
+        ls target/$TARGET/debug/deps/librlibc-*.rlib
+
+        if [[ $? == 0 ]]; then
+            exit 1
+        fi
+
+        set -e
+    fi
+}
+
 main() {
     if [[ $LINUX && ${IN_DOCKER_CONTAINER:-n} == n ]]; then
         # NOTE The Dockerfile of this image is in the docker branch of this repository
@@ -89,6 +90,7 @@ main() {
         inspect
         run_tests
         c_test
+        weak_test
     fi
 }