Skip to content

Commit

Permalink
Convert zero-output EXPECT_ERR=<<EOF to single-line EXPECT_ERR= (#4744)
Browse files Browse the repository at this point in the history
  • Loading branch information
kazarmy authored Nov 26, 2024
1 parent 7b2737f commit 56d9cf5
Show file tree
Hide file tree
Showing 11 changed files with 13 additions and 26 deletions.
3 changes: 1 addition & 2 deletions test/db/abi/languages/freepascal
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,7 @@ pdf
EOF
EXPECT=<<EOF
EOF
EXPECT_ERR=<<EOF
EOF
EXPECT_ERR=
RUN

NAME=LANGUAGES : freepascal detection
Expand Down
3 changes: 1 addition & 2 deletions test/db/analysis/avr
Original file line number Diff line number Diff line change
Expand Up @@ -778,8 +778,7 @@ aae
EOF
EXPECT=<<EOF
EOF
EXPECT_ERR=<<EOF
EOF
EXPECT_ERR=
RUN

NAME=avr stop analysis when invalid instruction is found
Expand Down
3 changes: 1 addition & 2 deletions test/db/archos/linux-x64/dbg_trace
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,5 @@ main+8
entry0+41
EOF
REGEXP_FILTER_ERR=ERROR.*\n
EXPECT_ERR=<<EOF
EOF
EXPECT_ERR=
RUN
3 changes: 1 addition & 2 deletions test/db/cmd/cmd_rop
Original file line number Diff line number Diff line change
Expand Up @@ -600,6 +600,5 @@ Gadget size: 12
Gadget size: 10

EOF
EXPECT_ERR=<<EOF
EOF
EXPECT_ERR=
RUN
3 changes: 1 addition & 2 deletions test/db/cmd/project
Original file line number Diff line number Diff line change
Expand Up @@ -408,6 +408,5 @@ nth addr vt_offset type name
1 0x00000100 ---------- DEFAULT Meeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeethod

EOF
EXPECT_ERR=<<EOF
EOF
EXPECT_ERR=
RUN
3 changes: 1 addition & 2 deletions test/db/cmd/warnings
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,5 @@ CMDS=<<EOF
EOF
EXPECT=<<EOF
EOF
EXPECT_ERR=<<EOF
EOF
EXPECT_ERR=
RUN
3 changes: 1 addition & 2 deletions test/db/formats/elf/obj
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,7 @@ CMDS=ie~addr
EXPECT=<<EOF
vaddr=0x00000000 paddr=0x00000040 baddr=0x00000000 laddr=0x00000000 haddr=0x00000018 type=program
EOF
EXPECT_ERR=<<EOF
EOF
EXPECT_ERR=
RUN

NAME=obj entry
Expand Down
3 changes: 1 addition & 2 deletions test/db/io/cache
Original file line number Diff line number Diff line change
Expand Up @@ -163,6 +163,5 @@ wx 90
wc-*
wx 90
EOF
EXPECT_ERR=<<EOF
EOF
EXPECT_ERR=
RUN
6 changes: 2 additions & 4 deletions test/db/tools/rz
Original file line number Diff line number Diff line change
Expand Up @@ -103,8 +103,7 @@ CMDS=!rizin -i scripts/no-nl-at-eof.rz -Nq =
EXPECT=<<EOF
1
EOF
EXPECT_ERR=<<EOF
EOF
EXPECT_ERR=
RUN

NAME=rizin -i -Q with missing script
Expand Down Expand Up @@ -139,8 +138,7 @@ RUN
NAME=rizin empty -R
FILE==
CMDS=!rizin -R ""
EXPECT_ERR=<<EOF
EOF
EXPECT_ERR=
RUN

NAME=rizin project with explicit file
Expand Down
3 changes: 1 addition & 2 deletions test/db/tools/rz_bin
Original file line number Diff line number Diff line change
Expand Up @@ -879,8 +879,7 @@ RUN
NAME=rz-bin -D Invalid
FILE==
CMDS=!rz-bin -D Invalid XXXXX
EXPECT_ERR=<<EOF
EOF
EXPECT_ERR=
EXPECT=<<EOF
Language 'Invalid' is unsupported
List of supported languages:
Expand Down
6 changes: 2 additions & 4 deletions test/db/tools/rz_hash
Original file line number Diff line number Diff line change
Expand Up @@ -179,8 +179,7 @@ CMDS=!rz-hash -a luhn -s "5105105105105100"
EXPECT=<<EOF
string: 0x00000000-0x00000010 luhn: 0
EOF
EXPECT_ERR=<<EOF
EOF
EXPECT_ERR=
RUN

NAME=rz-hash -a luhn -s "4408041234567890"
Expand All @@ -189,8 +188,7 @@ CMDS=!rz-hash -a luhn -s "4408041234567890"
EXPECT=<<EOF
string: 0x00000000-0x00000010 luhn: 7
EOF
EXPECT_ERR=<<EOF
EOF
EXPECT_ERR=
RUN

NAME=rz-hash -a luhn -s "1567jdjaskldsa" INVALID
Expand Down

0 comments on commit 56d9cf5

Please sign in to comment.