mirror/v
1
0
Fork 0
mirror of https://github.com/vlang/v.git synced 2023-08-10 21:13:21 +03:00
Code Issues Projects Releases Wiki Activity

ci: fix a race in vlib/v/compiler_errors_test.v execution on m1

Browse Source
This commit is contained in:
Delyan Angelov
2021-04-05 22:57:53 +03:00
parent b041681c00
commit 10619d098c
6 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
vlib/v/util/diff.v
View File

@@ -68,11 +68,11 @@ pub fn color_compare_files(diff_cmd string, file1 string, file2 string) string {
return ''
}
pub fn color_compare_strings(diff_cmd string, expected string, found string) string {
pub fn color_compare_strings(diff_cmd string, unique_prefix string, expected string, found string) string {
cdir := os.cache_dir()
ctime := time.sys_mono_now()
e_file := os.join_path(cdir, '${ctime}.expected.txt')
f_file := os.join_path(cdir, '${ctime}.found.txt')
e_file := os.join_path(cdir, '${unique_prefix}_${ctime}.expected.txt')
f_file := os.join_path(cdir, '${unique_prefix}_${ctime}.found.txt')
os.write_file(e_file, expected) or { panic(err) }
os.write_file(f_file, found) or { panic(err) }
res := color_compare_files(diff_cmd, e_file, f_file)