diff options
| author | Eddie Hung <eddieh@ece.ubc.ca> | 2019-02-17 11:50:55 -0800 |
|---|---|---|
| committer | Eddie Hung <eddieh@ece.ubc.ca> | 2019-02-17 11:50:55 -0800 |
| commit | 430a7548bca6046c812f713877253f8c3d81d805 (patch) | |
| tree | c0091a26a27970ad447d95f434923efa5f2e3a3d /tests/tools | |
| parent | 144c5d4359915bd73cc1cf2bc7dd58ae3a9d8308 (diff) | |
| download | yosys-430a7548bca6046c812f713877253f8c3d81d805.tar.gz yosys-430a7548bca6046c812f713877253f8c3d81d805.tar.bz2 yosys-430a7548bca6046c812f713877253f8c3d81d805.zip | |
One more merge conflict
Diffstat (limited to 'tests/tools')
| -rwxr-xr-x | tests/tools/autotest.sh | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/tests/tools/autotest.sh b/tests/tools/autotest.sh index 2722cba19..b5abc3570 100755 --- a/tests/tools/autotest.sh +++ b/tests/tools/autotest.sh @@ -134,18 +134,13 @@ do fn=$(basename $fn) bn=$(basename $bn) -<<<<<<< HEAD + rm -f ${bn}_ref.fir if [[ "$ext" == "v" ]]; then egrep -v '^\s*`timescale' ../$fn > ${bn}_ref.${ext} else "$toolsdir"/../../yosys -f "$frontend $include_opts" -b "verilog" -o ${bn}_ref.v ../${fn} frontend="verilog" fi -======= - rm -f ${bn}_ref.fir - - egrep -v '^\s*`timescale' ../$fn > ${bn}_ref.v ->>>>>>> e45f62b0c56717a23099425f078d1e56212aa632 if [ ! -f ../${bn}_tb.v ]; then "$toolsdir"/../../yosys -f "$frontend $include_opts" -b "test_autotb $autotb_opts" -o ${bn}_tb.v ${bn}_ref.v |