fix ci and update freebsd image

devnexen · devnexen · commit 4cba6f324e81 · 2023-04-20T22:38:18.000+01:00
diff --git a/.cirrus.yml b/.cirrus.yml
@@ -15,7 +15,7 @@ task:
 task:
   name: nightly x86_64-unknown-freebsd-13
   freebsd_instance:
-    image_family: freebsd-13-1
+    image_family: freebsd-13-2
   setup_script:
     - pkg install -y libnghttp2 curl
     - curl https://sh.rustup.rs -sSf --output rustup.sh
diff --git a/libc-test/build.rs b/libc-test/build.rs
@@ -2286,6 +2286,9 @@ fn test_freebsd(target: &str) {
             // Added in FreeBSD 14
             "EV_KEEPUDATA" if Some(14) > freebsd_ver => true,
 
+            // Added in FreeBSD 13.2
+            "AT_USRSTACKBASE" | "AT_USRSTACKLIM" if Some(13) > freebsd_ver => true,
+
             _ => false,
         }
     });
diff --git a/libc-test/semver/freebsd.txt b/libc-test/semver/freebsd.txt
@@ -109,8 +109,6 @@ AT_REMOVEDIR
 AT_RESOLVE_BENEATH
 AT_SYMLINK_FOLLOW
 AT_SYMLINK_NOFOLLOW
-AT_USRSTACKBASE
-AT_USRSTACKLIM
 AT_UID
 B14400
 B28800

Original file line number	Diff line number	Diff line change
`@@ -2286,6 +2286,9 @@ fn test_freebsd(target: &str) {`
`2286`	`2286`	`// Added in FreeBSD 14`
`2287`	`2287`	`"EV_KEEPUDATA" if Some(14) > freebsd_ver => true,`
`2288`	`2288`
	`2289`	`+ // Added in FreeBSD 13.2`
	`2290`	`+ "AT_USRSTACKBASE" \| "AT_USRSTACKLIM" if Some(13) > freebsd_ver => true,`
	`2291`	`+`
`2289`	`2292`	`_ => false,`
`2290`	`2293`	`}`
`2291`	`2294`	`});`