d4ad9312ea
Resolve add/add conflict in test/helpers.tcl by merging both versions: - Keep master's report_file, report_file_filter, sort_objects functions - Keep branch's diff_files, diff_files_sorted functions - Use master's result_dir setup with branch's mkdir logic in make_result_file Resolve content conflict in test/regression by keeping branch's bash/ctest launcher over master's Tcl regression script. Signed-off-by: Jaehyun Kim <jhkim@precisioninno.com> |
||
|---|---|---|
| .. | ||
| test | ||
| WritePathSpice.cc | ||
| WritePathSpice.hh | ||
| WriteSpice.cc | ||
| WriteSpice.hh | ||
| WriteSpice.i | ||
| WriteSpice.tcl | ||
| Xyce.cc | ||
| Xyce.hh | ||