Merge pull request #1647 from vickenty/osx

Fix CI

Author: JohnTitor

.cirrus.yml

@@ -15,7 +15,7 @@ task:
 task:
   name: stable x86_64-unknown-freebsd-11
   freebsd_instance:
-    image: freebsd-11-3-stable-amd64-v20190801
+    image: freebsd-11-3-stable-amd64-v20200213
   setup_script:
     - pkg install -y curl
     - curl https://sh.rustup.rs -sSf --output rustup.sh

ci/azure-install-rust.yml

@@ -45,9 +45,9 @@ steps:
   - bash: |
       set -ex
       gcc -print-search-dirs
-      find "C:\ProgramData\Chocolatey" -name "crt2*"
-      find "C:\ProgramData\Chocolatey" -name "dllcrt2*"
-      find "C:\ProgramData\Chocolatey" -name "libmsvcrt*"
+      /usr/bin/find "C:\ProgramData\Chocolatey" -name "crt2*"
+      /usr/bin/find "C:\ProgramData\Chocolatey" -name "dllcrt2*"
+      /usr/bin/find "C:\ProgramData\Chocolatey" -name "libmsvcrt*"
     condition: eq( variables['Agent.OS'], 'Windows_NT' )	
     displayName: Find GCC libraries (windows)
   - bash: |

ci/azure.yml

@@ -99,18 +99,6 @@ jobs:
         x86_64-apple-darwin:
           TARGET: x86_64-apple-darwin
 
-  - job: DockerOSX32
-    pool:
-      vmImage: macos-10.13
-    steps:
-      - template: azure-install-rust.yml
-      - bash: LIBC_CI=1 sh ./ci/run.sh $TARGET
-        displayName: Execute run.sh
-    strategy:
-      matrix:
-        i686-apple-darwin:
-          TARGET: i686-apple-darwin
-
   - job: Windows
     pool:
       vmImage: vs2017-win2016

ci/build.sh

@@ -147,12 +147,15 @@ x86_64-unknown-linux-gnux32 \
 
 RUST_OSX_TARGETS="\
 aarch64-apple-ios \
+x86_64-apple-darwin \
+x86_64-apple-ios \
+"
+
+RUST_LT_1_42_OSX_TARGETS="\
 armv7-apple-ios \
 armv7s-apple-ios \
 i386-apple-ios \
 i686-apple-darwin \
-x86_64-apple-darwin \
-x86_64-apple-ios \
 "
 
 # The targets are listed here alphabetically
@@ -178,6 +181,12 @@ case "${OS}" in
         ;;
     osx*)
         TARGETS="${RUST_OSX_TARGETS}"
+
+        if [ "${RUST}" != "nightly" ]; then
+            if [ "${RUST}" != "beta" ]; then
+                TARGETS="${TARGETS} ${RUST_LT_1_42_OSX_TARGETS}"
+            fi
+        fi
         ;;
     *)
         ;;
@@ -270,3 +279,17 @@ if [ "${RUST}" = "nightly" ] && [ "${OS}" = "linux" ]; then
     cargo xbuild --target switch.json
 fi
 
+RUST_OSX_NO_CORE_TARGETS="\
+armv7-apple-ios \
+armv7s-apple-ios \
+i386-apple-ios \
+i686-apple-darwin \
+"
+
+if [ "${RUST}" = "nightly" ] && [ "${OS}" = "osx" ]; then
+    for TARGET in $RUST_OSX_NO_CORE_TARGETS; do
+        if echo "$TARGET" | grep -q "$FILTER"; then
+            test_target xbuild "$TARGET" 1
+        fi
+    done
+fi

libc-test/build.rs

@@ -389,7 +389,7 @@ fn test_openbsd(target: &str) {
 
     cfg.skip_field_type(move |struct_, field| {
         // type siginfo_t.si_addr changed from OpenBSD 6.0 to 6.1
-        (struct_ == "siginfo_t" && field == "si_addr")
+        struct_ == "siginfo_t" && field == "si_addr"
     });
 
     cfg.generate("../src/lib.rs", "main.rs");

src/fuchsia/mod.rs

@@ -1509,12 +1509,12 @@ pub const LC_COLLATE: ::c_int = 3;
 pub const LC_MONETARY: ::c_int = 4;
 pub const LC_MESSAGES: ::c_int = 5;
 pub const LC_ALL: ::c_int = 6;
-pub const LC_CTYPE_MASK: ::c_int = (1 << LC_CTYPE);
-pub const LC_NUMERIC_MASK: ::c_int = (1 << LC_NUMERIC);
-pub const LC_TIME_MASK: ::c_int = (1 << LC_TIME);
-pub const LC_COLLATE_MASK: ::c_int = (1 << LC_COLLATE);
-pub const LC_MONETARY_MASK: ::c_int = (1 << LC_MONETARY);
-pub const LC_MESSAGES_MASK: ::c_int = (1 << LC_MESSAGES);
+pub const LC_CTYPE_MASK: ::c_int = 1 << LC_CTYPE;
+pub const LC_NUMERIC_MASK: ::c_int = 1 << LC_NUMERIC;
+pub const LC_TIME_MASK: ::c_int = 1 << LC_TIME;
+pub const LC_COLLATE_MASK: ::c_int = 1 << LC_COLLATE;
+pub const LC_MONETARY_MASK: ::c_int = 1 << LC_MONETARY;
+pub const LC_MESSAGES_MASK: ::c_int = 1 << LC_MESSAGES;
 // LC_ALL_MASK defined per platform
 
 pub const MAP_FILE: ::c_int = 0x0000;
@@ -2691,7 +2691,7 @@ pub const FOPEN_MAX: ::c_uint = 1000;
 pub const O_PATH: ::c_int = 0x00400000;
 pub const O_EXEC: ::c_int = O_PATH;
 pub const O_SEARCH: ::c_int = O_PATH;
-pub const O_ACCMODE: ::c_int = (03 | O_SEARCH);
+pub const O_ACCMODE: ::c_int = 03 | O_SEARCH;
 pub const O_NDELAY: ::c_int = O_NONBLOCK;
 pub const NI_MAXHOST: ::socklen_t = 255;
 pub const PTHREAD_STACK_MIN: ::size_t = 2048;
@@ -2893,7 +2893,7 @@ pub const O_CREAT: ::c_int = 0x00010000;
 pub const O_EXCL: ::c_int = 0x00020000;
 pub const O_NOCTTY: ::c_int = 0x00000200;
 pub const O_NONBLOCK: ::c_int = 0x00000010;
-pub const O_SYNC: ::c_int = (0x00000040 | O_DSYNC);
+pub const O_SYNC: ::c_int = 0x00000040 | O_DSYNC;
 pub const O_RSYNC: ::c_int = O_SYNC;
 pub const O_DSYNC: ::c_int = 0x00000020;
 

src/unix/bsd/apple/mod.rs

@@ -1239,12 +1239,12 @@ pub const ACCOUNTING: ::c_short = 9;
 pub const SIGNATURE: ::c_short = 10;
 pub const SHUTDOWN_TIME: ::c_short = 11;
 
-pub const LC_COLLATE_MASK: ::c_int = (1 << 0);
-pub const LC_CTYPE_MASK: ::c_int = (1 << 1);
-pub const LC_MESSAGES_MASK: ::c_int = (1 << 2);
-pub const LC_MONETARY_MASK: ::c_int = (1 << 3);
-pub const LC_NUMERIC_MASK: ::c_int = (1 << 4);
-pub const LC_TIME_MASK: ::c_int = (1 << 5);
+pub const LC_COLLATE_MASK: ::c_int = 1 << 0;
+pub const LC_CTYPE_MASK: ::c_int = 1 << 1;
+pub const LC_MESSAGES_MASK: ::c_int = 1 << 2;
+pub const LC_MONETARY_MASK: ::c_int = 1 << 3;
+pub const LC_NUMERIC_MASK: ::c_int = 1 << 4;
+pub const LC_TIME_MASK: ::c_int = 1 << 5;
 pub const LC_ALL_MASK: ::c_int = LC_COLLATE_MASK
     | LC_CTYPE_MASK
     | LC_MESSAGES_MASK

src/unix/bsd/freebsdlike/dragonfly/mod.rs

@@ -956,12 +956,12 @@ pub const UTX_DB_UTMPX: ::c_uint = 0;
 pub const UTX_DB_WTMPX: ::c_uint = 1;
 pub const UTX_DB_LASTLOG: ::c_uint = 2;
 
-pub const LC_COLLATE_MASK: ::c_int = (1 << 0);
-pub const LC_CTYPE_MASK: ::c_int = (1 << 1);
-pub const LC_MONETARY_MASK: ::c_int = (1 << 2);
-pub const LC_NUMERIC_MASK: ::c_int = (1 << 3);
-pub const LC_TIME_MASK: ::c_int = (1 << 4);
-pub const LC_MESSAGES_MASK: ::c_int = (1 << 5);
+pub const LC_COLLATE_MASK: ::c_int = 1 << 0;
+pub const LC_CTYPE_MASK: ::c_int = 1 << 1;
+pub const LC_MONETARY_MASK: ::c_int = 1 << 2;
+pub const LC_NUMERIC_MASK: ::c_int = 1 << 3;
+pub const LC_TIME_MASK: ::c_int = 1 << 4;
+pub const LC_MESSAGES_MASK: ::c_int = 1 << 5;
 pub const LC_ALL_MASK: ::c_int = LC_COLLATE_MASK
     | LC_CTYPE_MASK
     | LC_MESSAGES_MASK

src/unix/bsd/freebsdlike/freebsd/mod.rs

@@ -1024,12 +1024,12 @@ pub const UTXDB_ACTIVE: ::c_int = 0;
 pub const UTXDB_LASTLOGIN: ::c_int = 1;
 pub const UTXDB_LOG: ::c_int = 2;
 
-pub const LC_COLLATE_MASK: ::c_int = (1 << 0);
-pub const LC_CTYPE_MASK: ::c_int = (1 << 1);
-pub const LC_MONETARY_MASK: ::c_int = (1 << 2);
-pub const LC_NUMERIC_MASK: ::c_int = (1 << 3);
-pub const LC_TIME_MASK: ::c_int = (1 << 4);
-pub const LC_MESSAGES_MASK: ::c_int = (1 << 5);
+pub const LC_COLLATE_MASK: ::c_int = 1 << 0;
+pub const LC_CTYPE_MASK: ::c_int = 1 << 1;
+pub const LC_MONETARY_MASK: ::c_int = 1 << 2;
+pub const LC_NUMERIC_MASK: ::c_int = 1 << 3;
+pub const LC_TIME_MASK: ::c_int = 1 << 4;
+pub const LC_MESSAGES_MASK: ::c_int = 1 << 5;
 pub const LC_ALL_MASK: ::c_int = LC_COLLATE_MASK
     | LC_CTYPE_MASK
     | LC_MESSAGES_MASK

src/unix/bsd/netbsdlike/netbsd/mod.rs

@@ -865,12 +865,12 @@ pub const AT_REMOVEDIR: ::c_int = 0x800;
 pub const EXTATTR_NAMESPACE_USER: ::c_int = 1;
 pub const EXTATTR_NAMESPACE_SYSTEM: ::c_int = 2;
 
-pub const LC_COLLATE_MASK: ::c_int = (1 << ::LC_COLLATE);
-pub const LC_CTYPE_MASK: ::c_int = (1 << ::LC_CTYPE);
-pub const LC_MONETARY_MASK: ::c_int = (1 << ::LC_MONETARY);
-pub const LC_NUMERIC_MASK: ::c_int = (1 << ::LC_NUMERIC);
-pub const LC_TIME_MASK: ::c_int = (1 << ::LC_TIME);
-pub const LC_MESSAGES_MASK: ::c_int = (1 << ::LC_MESSAGES);
+pub const LC_COLLATE_MASK: ::c_int = 1 << ::LC_COLLATE;
+pub const LC_CTYPE_MASK: ::c_int = 1 << ::LC_CTYPE;
+pub const LC_MONETARY_MASK: ::c_int = 1 << ::LC_MONETARY;
+pub const LC_NUMERIC_MASK: ::c_int = 1 << ::LC_NUMERIC;
+pub const LC_TIME_MASK: ::c_int = 1 << ::LC_TIME;
+pub const LC_MESSAGES_MASK: ::c_int = 1 << ::LC_MESSAGES;
 pub const LC_ALL_MASK: ::c_int = !0;
 
 pub const ERA: ::nl_item = 52;