diff options
author | cvs2svn <admin@example.com> | 2025-04-14 17:32:06 +0000 |
---|---|---|
committer | cvs2svn <admin@example.com> | 2025-04-14 17:32:06 +0000 |
commit | eb8dd9dca1228af0cd132f515509051ecfabf6f6 (patch) | |
tree | edb6da6af7e865d488dc1a29309f1e1ec226e603 /src/regress/lib/libssl/rust-openssl | |
parent | 247f0352e0ed72a4f476db9dc91f4d982bc83eb2 (diff) | |
download | openbsd-tb_20250414.tar.gz openbsd-tb_20250414.tar.bz2 openbsd-tb_20250414.zip |
This commit was manufactured by cvs2git to create tag 'tb_20250414'.tb_20250414
Diffstat (limited to 'src/regress/lib/libssl/rust-openssl')
-rw-r--r-- | src/regress/lib/libssl/rust-openssl/Cargo.toml | 9 | ||||
-rw-r--r-- | src/regress/lib/libssl/rust-openssl/Makefile | 58 | ||||
-rw-r--r-- | src/regress/lib/libssl/rust-openssl/config.toml | 6 |
3 files changed, 0 insertions, 73 deletions
diff --git a/src/regress/lib/libssl/rust-openssl/Cargo.toml b/src/regress/lib/libssl/rust-openssl/Cargo.toml deleted file mode 100644 index 63194cb3fd..0000000000 --- a/src/regress/lib/libssl/rust-openssl/Cargo.toml +++ /dev/null | |||
@@ -1,9 +0,0 @@ | |||
1 | [workspace] | ||
2 | resolver = "2" | ||
3 | members = [ | ||
4 | "openssl", | ||
5 | "openssl-errors", | ||
6 | "openssl-macros", | ||
7 | "openssl-sys", | ||
8 | "systest", | ||
9 | ] | ||
diff --git a/src/regress/lib/libssl/rust-openssl/Makefile b/src/regress/lib/libssl/rust-openssl/Makefile deleted file mode 100644 index dc17deee61..0000000000 --- a/src/regress/lib/libssl/rust-openssl/Makefile +++ /dev/null | |||
@@ -1,58 +0,0 @@ | |||
1 | # $OpenBSD: Makefile,v 1.5 2024/06/23 13:53:21 tb Exp $ | ||
2 | |||
3 | RUST_OPENSSL_TESTS = /usr/local/share/rust-openssl-tests | ||
4 | CARGO = /usr/local/bin/cargo | ||
5 | |||
6 | .if !exists(${RUST_OPENSSL_TESTS}) || !exists(${CARGO}) | ||
7 | regress: | ||
8 | @echo packages rust-openssl-tests and rust are required for this regress | ||
9 | @echo SKIPPED | ||
10 | .else | ||
11 | |||
12 | REGRESS_TARGETS += rust-openssl-test | ||
13 | |||
14 | WORKSPACE_LINKS = openssl openssl-errors openssl-macros openssl-sys systest | ||
15 | |||
16 | _WORKSPACE_COOKIE = .workspace | ||
17 | |||
18 | ${_WORKSPACE_COOKIE}: | ||
19 | . if ${.CURDIR} != ${.OBJDIR} | ||
20 | cp ${.CURDIR}/Cargo.toml ${.OBJDIR}/ | ||
21 | . endif | ||
22 | mkdir -p .cargo | ||
23 | cp ${.CURDIR}/config.toml .cargo/ | ||
24 | cd ${.OBJDIR} && ln -sf ${WORKSPACE_LINKS:S,^,${RUST_OPENSSL_TESTS}/,} . | ||
25 | touch $@ | ||
26 | |||
27 | CLEANFILES += Cargo.lock | ||
28 | |||
29 | . if ${.CURDIR} != ${.OBJDIR} | ||
30 | CLEANFILES += Cargo.toml | ||
31 | . endif | ||
32 | |||
33 | # Force use of base-clang on sparc64 since the build with base-gcc fails with: | ||
34 | # error occurred: Command "cc" "-O0" "-ffunction-sections" "-fdata-sections" [...] | ||
35 | # did not execute successfully (status code exit status: 1). | ||
36 | . if "${MACHINE_ARCH}" == sparc64 | ||
37 | CARGO_CC=/usr/bin/clang | ||
38 | . else | ||
39 | CARGO_CC=cc | ||
40 | . endif | ||
41 | |||
42 | rust-openssl-test: ${_WORKSPACE_COOKIE} | ||
43 | cd ${.OBJDIR} && env CC=${CARGO_CC} \ | ||
44 | cargo test --offline --color=never -- --color=never | ||
45 | |||
46 | CLEANFILES += ${_WORKSPACE_COOKIE} ${WORKSPACE_LINKS} | ||
47 | |||
48 | . if make(clean) || make(cleandir) | ||
49 | . if exists(.cargo) || exists(target) | ||
50 | .BEGIN: | ||
51 | rm -rf .cargo | ||
52 | rm -rf target | ||
53 | . endif | ||
54 | . endif | ||
55 | |||
56 | .endif | ||
57 | |||
58 | .include <bsd.regress.mk> | ||
diff --git a/src/regress/lib/libssl/rust-openssl/config.toml b/src/regress/lib/libssl/rust-openssl/config.toml deleted file mode 100644 index a47474744d..0000000000 --- a/src/regress/lib/libssl/rust-openssl/config.toml +++ /dev/null | |||
@@ -1,6 +0,0 @@ | |||
1 | [net] | ||
2 | offline = true | ||
3 | [source.modcargo] | ||
4 | directory = '/usr/local/share/rust-openssl-tests/modcargo-crates' | ||
5 | [source.crates-io] | ||
6 | replace-with = 'modcargo' | ||