Skip to content

Commit d0abe3a

Browse files
authored
Merge pull request #9125 from osamahammad21/odb-regresion-fix
ODB: Fix test datarace on writing results
2 parents 0aa3f6a + aae7741 commit d0abe3a

File tree

3 files changed

+13
-2
lines changed

3 files changed

+13
-2
lines changed

src/odb/test/write_3dbv.tcl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ set db [ord::get_db]
44
set tech [odb::dbTech_create $db "tech"]
55

66
read_3dbx "data/example.3dbx"
7-
set out_3dbv [make_result_file "write_3dbv.3dbv"]
7+
set out_3dbv [make_result_file "write_3dbv/write_3dbv.3dbv"]
88
set 3dbv_write_result [write_3dbv $out_3dbv]
99

1010
diff_files $out_3dbv "write_3dbv.3dbvok"

src/odb/test/write_3dbx.tcl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ set db [ord::get_db]
44
set tech [odb::dbTech_create $db "tech"]
55

66
read_3dbx "data/example.3dbx"
7-
set out_3dbx [make_result_file "write_3dbx.3dbx"]
7+
set out_3dbx [make_result_file "write_3dbx/write_3dbx.3dbx"]
88
set 3dbx_write_result [write_3dbx $out_3dbx]
99

1010
diff_files $out_3dbx "write_3dbx.3dbxok"

test/helpers.tcl

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,23 @@ proc make_result_dir { } {
2020
return $result_dir
2121
}
2222

23+
proc make_result_test_dir { subdir } {
24+
variable result_dir
25+
set full_path [file join $result_dir $subdir]
26+
if { ![file exists $full_path] } {
27+
file mkdir $full_path
28+
}
29+
return $full_path
30+
}
31+
2332
proc make_result_file { filename } {
2433
variable result_dir
2534

2635
make_result_dir
2736

2837
set root [file rootname $filename]
38+
set dir [file dirname $filename]
39+
make_result_test_dir $dir
2940
set ext [file extension $filename]
3041
set filename "$root-tcl$ext"
3142
return [file join $result_dir $filename]

0 commit comments

Comments
 (0)