Fix test cases and enable them.
diff --git a/regress/Makefile.am b/regress/Makefile.am index 1317fad..ff7236e 100644 --- a/regress/Makefile.am +++ b/regress/Makefile.am
@@ -130,6 +130,7 @@ extra_count.test \ extra_count_by_id.test \ extra_count_ignore_zip64.test \ + extra_delete.test \ extra_delete_by_id.test \ extra_get.test \ extra_get_by_id.test \ @@ -186,7 +187,6 @@ encoding-cp437.test \ encoding-cp437-all.test \ encoding-utf-8.test \ - extra_delete.test \ open_filename_duplicate.test \ open_filename_duplicate_consistency.test \ open_filename_duplicate_empty.test \
diff --git a/regress/extra_delete.test b/regress/extra_delete.test index d8f21ff..e2a2344 100644 --- a/regress/extra_delete.test +++ b/regress/extra_delete.test
@@ -1,9 +1,17 @@ # delete extra field by index program modify -args encrypt.zip get_extra_by_id 0 2345 0 c get_extra_by_id 0 2345 0 l delete_extra 0 0 cl get_extra_by_id 0 2345 0 c get_extra_by_id 0 2345 0 l +args encrypt.zip get_extra 0 0 c get_extra 0 1 c get_extra 0 2 c get_extra 0 0 l get_extra 0 1 l get_extra 0 2 l delete_extra 0 2 c delete_extra 0 0 l get_extra 0 0 c get_extra 0 1 c get_extra 0 2 c get_extra 0 0 l get_extra 0 1 l get_extra 0 2 l file encrypt.zip encrypt_plus_extra.zip encrypt.zip -return 0 +return 1 +stdout Extra field 0x5455: len 5, data 0x033dda4c44 +stdout Extra field 0x7855: len 0 stdout Extra field 0x0929: len 17, data 0x65787472616669656c64636f6e74656e74 stdout Extra field 0x0929: len 17, data 0x65787472616669656c64636f6e74656e74 -stderr can't get extra field data for file at index 0, extra field id 2345, ef index 0, flags 512: No such file -stderr can't get extra field data for file at index 0, extra field id 2345, ef index 0, flags 256: No such file +stdout Extra field 0x5455: len 9, data 0x033dda4c444dda4c44 +stdout Extra field 0x7855: len 4, data 0x64001400 +stdout Extra field 0x5455: len 5, data 0x033dda4c44 +stdout Extra field 0x7855: len 0 +stdout Extra field 0x5455: len 9, data 0x033dda4c444dda4c44 +stdout Extra field 0x7855: len 4, data 0x64001400 +stderr can't get extra field data for file at index 0, extra field 2, flags 512: No such file +stderr can't get extra field data for file at index 0, extra field 2, flags 256: No such file
diff --git a/regress/extra_delete_by_id.test b/regress/extra_delete_by_id.test index a314da7..dff30d2 100644 --- a/regress/extra_delete_by_id.test +++ b/regress/extra_delete_by_id.test
@@ -1,7 +1,7 @@ # delete extra field by id and index program modify #args encrypt.zip set_extra 0 2345 65535 cl extrafieldcontent -args encrypt.zip delete_extra_by_id 0 2345 0 cl get_extra_by_id 0 2345 0 c get_extra_by_id 0 2345 0 l +args encrypt.zip delete_extra_by_id 0 2345 0 c delete_extra_by_id 0 2345 0 l get_extra_by_id 0 2345 0 c get_extra_by_id 0 2345 0 l return 1 file encrypt.zip encrypt_plus_extra.zip encrypt.zip stderr can't get extra field data for file at index 0, extra field id 2345, ef index 0, flags 512: No such file