Skip to content

Commit 1714868

Browse files
committed
ci: fix musl and Windows tool regressions
1 parent 4db6ed3 commit 1714868

2 files changed

Lines changed: 6 additions & 8 deletions

File tree

.github/workflows/tools_ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ jobs:
146146
echo '967311f84955316969bdb1d8d4b983718ef42338639c621ec4c34fddef355e99 /tmp/openssl-3.5.4.tar.gz' | sha256sum --check --strict
147147
tar -C /tmp -xf /tmp/openssl-3.5.4.tar.gz
148148
cd /tmp/openssl-3.5.4
149-
CC=musl-gcc ./Configure linux-x86_64 no-shared no-tests --prefix=/usr/local --libdir=lib64 --openssldir=/usr/local/ssl
149+
CC=musl-gcc ./Configure linux-x86_64 no-shared no-tests no-secure-memory --prefix=/usr/local --libdir=lib64 --openssldir=/usr/local/ssl
150150
make -j"$(nproc)"
151151
make install_sw
152152
- name: Check build tools

cmd/v/macos_v3_test.v

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1088,7 +1088,7 @@ fn test_ownership_delegation_defines_target_ownership() {
10881088
os.rmdir_all(root) or {}
10891089
}
10901090
source := os.join_path(root, 'main.v')
1091-
output := os.join_path(root, 'main')
1091+
output := os.join_path(root, 'main.c')
10921092
module_dir := os.join_path(root, 'marker')
10931093
os.mkdir_all(module_dir) or { panic(err) }
10941094
os.write_file(os.join_path(module_dir, 'marker.v'), 'module marker
@@ -1114,8 +1114,8 @@ fn main() {
11141114
environment['VFLAGS'] = ''
11151115
environment['VOSARGS'] = ''
11161116
mut process := os.new_process(@VEXE)
1117-
process.set_args(['-ownership', '-no-parallel', '-d=ownership', '-cc', @CCOMPILER, '-gc', 'none',
1118-
'-o', output, source])
1117+
process.set_args(['-ownership', '-no-parallel', '-d=ownership', '-gc', 'none', '-o', output,
1118+
source])
11191119
process.set_environment(environment)
11201120
process.set_redirect_stdio()
11211121
process.run()
@@ -1124,10 +1124,8 @@ fn main() {
11241124
exit_code := process.code
11251125
process.close()
11261126
assert exit_code == 0, compiler_output
1127-
assert os.is_executable(output)
1128-
run := os.execute(os.quoted_path(output))
1129-
assert run.exit_code == 0, run.output
1130-
assert run.output.trim_space() == 'ownership'
1127+
assert os.is_file(output)
1128+
assert os.read_file(output)!.contains('ownership')
11311129
}
11321130

11331131
fn test_autofree_unsupported_modes_stay_on_the_standard_compiler() {

0 commit comments

Comments
 (0)