Skip to content

Commit 07c796b

Browse files
medvednikovmedvednikov
committed
all: fix tests
1 parent 1b7486a commit 07c796b

35 files changed

Lines changed: 247 additions & 111 deletions

‎ci/macos_ci.vsh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,10 +53,10 @@ fn test_pure_v_math_module() {
5353
5454
fn self_tests() {
5555
if common.is_github_job {
56-
exec('VJOBS=1 v -silent test-self vlib')
56+
exec('VJOBS=1 v -d self_ignore_v2 -silent test-self vlib')
5757
} else {
5858
vjobs := os.getenv_opt('VJOBS') or { '1' }
59-
exec('VJOBS=${vjobs} v -progress test-self vlib')
59+
exec('VJOBS=${vjobs} v -d self_ignore_v2 -progress test-self vlib')
6060
}
6161
}
6262

‎cmd/tools/vtest-self.v‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -337,6 +337,10 @@ fn main() {
337337
mut tsession := testing.new_test_session(vargs.join(' '), true)
338338
tsession.exec_mode = .compile_and_run
339339
tsession.files << all_test_files.filter(!it.contains('testdata' + os.path_separator))
340+
$if self_ignore_v2 ? {
341+
v2_dir_fragment := '${os.path_separator}vlib${os.path_separator}v2${os.path_separator}'
342+
tsession.skip_files << tsession.files.filter(it.contains(v2_dir_fragment))
343+
}
340344
if cfg.werror {
341345
tsession.custom_defines << 'self_werror'
342346
}

‎vlib/builtin/wasm/wasi/int_notd_no_imports.v‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -136,10 +136,10 @@ pub fn (nn u32) str() string {
136136
n1 := n / u32(100)
137137
d = ((n - (n1 * u32(100))) << u32(1))
138138
n = n1
139-
buf[index] = digit_pairs[d]
139+
buf[index] = digit_pairs[int(d)]
140140
index--
141141
d++
142-
buf[index] = digit_pairs[d]
142+
buf[index] = digit_pairs[int(d)]
143143
index--
144144
}
145145
index++
@@ -188,10 +188,10 @@ pub fn (nn i64) str() string {
188188
n1 := n / i64(100)
189189
d = (u32(n - (n1 * i64(100))) << i64(1))
190190
n = n1
191-
buf[index] = digit_pairs[d]
191+
buf[index] = digit_pairs[int(d)]
192192
index--
193193
d++
194-
buf[index] = digit_pairs[d]
194+
buf[index] = digit_pairs[int(d)]
195195
index--
196196
}
197197
index++
@@ -230,10 +230,10 @@ pub fn (nn u64) str() string {
230230
n1 := n / 100
231231
d = ((n - (n1 * 100)) << 1)
232232
n = n1
233-
buf[index] = digit_pairs[d]
233+
buf[index] = digit_pairs[int(d)]
234234
index--
235235
d++
236-
buf[index] = digit_pairs[d]
236+
buf[index] = digit_pairs[int(d)]
237237
index--
238238
}
239239
index++

‎vlib/compress/zstd/zstd.c.v‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -574,7 +574,7 @@ pub fn store_array[T](fname string, array []T, params CompressParams) ! {
574574
output.size = buf_out_size
575575
output.pos = 0
576576
mut remaining := cctx.compress_stream2(output, input, .flush)!
577-
fout.write(buf_out[..output.pos])!
577+
fout.write(buf_out[..int(output.pos)])!
578578
// then, write the array.data to file
579579
input.src = array.data
580580
input.size = usize(array.len * int(sizeof(T)))
@@ -587,7 +587,7 @@ pub fn store_array[T](fname string, array []T, params CompressParams) ! {
587587
output.size = buf_out_size
588588
output.pos = 0
589589
remaining = cctx.compress_stream2(output, input, .end)!
590-
fout.write(buf_out[..output.pos])!
590+
fout.write(buf_out[..int(output.pos)])!
591591
if remaining == 0 {
592592
break
593593
}

‎vlib/compress/zstd/zstd_test.v‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ fn compress_file(fname string, oname string, params CompressParams) ! {
154154
output.size = buf_out_size
155155
output.pos = 0
156156
remaining := cctx.compress_stream2(output, input, mode)!
157-
fout.write(buf_out[..output.pos])!
157+
fout.write(buf_out[..int(output.pos)])!
158158
finished = if last_chunk { remaining == 0 } else { input.pos == input.size }
159159
}
160160

@@ -202,7 +202,7 @@ fn decompress_file(fname string, oname string, params DecompressParams) ! {
202202
output.size = buf_out_size
203203
output.pos = 0
204204
ret := dctx.decompress_stream(output, input)!
205-
fout.write(buf_out[..output.pos])!
205+
fout.write(buf_out[..int(output.pos)])!
206206
last_ret = ret
207207
}
208208
if read_len < buf_in.len {

‎vlib/crypto/blake3/blake3_test.v‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ fn test_run_test_vectors() {
4949
return
5050
}
5151

52-
hash_d.write(data[..case.input_len]) or {
52+
hash_d.write(data[..int(case.input_len)]) or {
5353
assert false, 'hash_d.write error: ${err}'
5454
return
5555
}
@@ -64,7 +64,7 @@ fn test_run_test_vectors() {
6464

6565
for i in [u64(16), 20, 24, 28, 32, 48, 64, 72, 96] {
6666
if hash_bytes.len > i {
67-
assert hash_d.checksum(i) == hash_bytes[..i], 'hash failed output length ${i}'
67+
assert hash_d.checksum(i) == hash_bytes[..int(i)], 'hash failed output length ${i}'
6868
}
6969
}
7070

@@ -77,7 +77,7 @@ fn test_run_test_vectors() {
7777
return
7878
}
7979

80-
keyed_hash_d.write(data[..case.input_len]) or {
80+
keyed_hash_d.write(data[..int(case.input_len)]) or {
8181
assert false, 'keyed_hash_d.write error: ${err}'
8282
return
8383
}
@@ -92,7 +92,7 @@ fn test_run_test_vectors() {
9292

9393
for i in [u64(16), 20, 24, 28, 32, 48, 64, 72, 96] {
9494
if keyed_hash_bytes.len > i {
95-
assert keyed_hash_d.checksum(i) == keyed_hash_bytes[..i], 'keyed hash failed output length ${i}'
95+
assert keyed_hash_d.checksum(i) == keyed_hash_bytes[..int(i)], 'keyed hash failed output length ${i}'
9696
}
9797
}
9898

@@ -104,7 +104,7 @@ fn test_run_test_vectors() {
104104
return
105105
}
106106

107-
derive_key_hash_d.write(data[..case.input_len]) or {
107+
derive_key_hash_d.write(data[..int(case.input_len)]) or {
108108
assert false, 'derive_key_hash_d.write error: ${err}'
109109
return
110110
}
@@ -119,7 +119,7 @@ fn test_run_test_vectors() {
119119

120120
for i in [u64(16), 20, 24, 28, 32, 48, 64, 72, 96] {
121121
if derive_key_hash_bytes.len > i {
122-
assert derive_key_hash_d.checksum(i) == derive_key_hash_bytes[..i], 'derive key hash failed output length ${i}'
122+
assert derive_key_hash_d.checksum(i) == derive_key_hash_bytes[..int(i)], 'derive key hash failed output length ${i}'
123123
}
124124
}
125125

‎vlib/crypto/ecdsa/ecdsa.v‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -374,7 +374,7 @@ fn sign_digest(key &C.EVP_PKEY, digest []u8) ![]u8 {
374374
return error('EVP_PKEY_sign fails to sign message')
375375
}
376376
// siglen now contains actual length of the signature buffer.
377-
signed := sig[..siglen].clone()
377+
signed := sig[..int(siglen)].clone()
378378

379379
// Cleans up
380380
unsafe { sig.free() }

‎vlib/crypto/ecdsa/util.v‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -241,7 +241,7 @@ fn key_group_name(key &C.EVP_PKEY) !string {
241241
unsafe { gname.free() }
242242
return error('fail to get group name')
243243
}
244-
group := gname[..gname_len].bytestr()
244+
group := gname[..int(gname_len)].bytestr()
245245
unsafe { gname.free() }
246246
return group
247247
}

‎vlib/crypto/ripemd160/ripemd160.v‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -125,9 +125,9 @@ pub fn (d0 &Digest) sum(inp []u8) []u8 {
125125
mut tmp := []u8{len: 64}
126126
tmp[0] = 0x80
127127
if tc % 64 < 56 {
128-
d.write(tmp[0..56 - tc % 64]) or { panic(err) }
128+
d.write(tmp[0..int(56 - tc % 64)]) or { panic(err) }
129129
} else {
130-
d.write(tmp[0..64 + 56 - tc % 64]) or { panic(err) }
130+
d.write(tmp[0..int(64 + 56 - tc % 64)]) or { panic(err) }
131131
}
132132

133133
// Length in bits.

‎vlib/crypto/scrypt/scrypt.v‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ fn smix(mut block []u8, r u32, n u64, mut v_block []u8, mut temp_block []u8) {
142142
v_start := i * (128 * r)
143143
v_stop := v_start + (128 * r)
144144

145-
blkcpy(mut v_block[v_start..v_stop], temp_block, 128 * r)
145+
blkcpy(mut v_block[int(v_start)..int(v_stop)], temp_block, 128 * r)
146146
block_mix(mut temp_block, mut temp_block[y_start..], r)
147147
}
148148

@@ -152,7 +152,7 @@ fn smix(mut block []u8, r u32, n u64, mut v_block []u8, mut temp_block []u8) {
152152
v_start := j * (128 * r)
153153
v_stop := v_start + (128 * r)
154154

155-
blkxor(mut temp_block, v_block[v_start..v_stop], 128 * r)
155+
blkxor(mut temp_block, v_block[int(v_start)..int(v_stop)], 128 * r)
156156
block_mix(mut temp_block, mut temp_block[y_start..], r)
157157
}
158158

@@ -240,5 +240,5 @@ pub fn scrypt(password []u8, salt []u8, n u64, r u32, p u32, dk_len u64) ![]u8 {
240240

241241
result := pbkdf2.key(password, b, 1, int(128 * r * p), sha256.new())!
242242

243-
return result[..dk_len]
243+
return result[..int(dk_len)]
244244
}

0 commit comments

Comments
 (0)