From c10da282d5503b4db07a583b075a42795a6da4d2 Mon Sep 17 00:00:00 2001 From: Moritz Bunkus Date: Tue, 28 Sep 2004 12:22:06 +0000 Subject: [PATCH] Merged 2225 --- tests/test-016cuesheet.rb | 3 ++- tests/test-017chapters.rb | 6 ++++-- tests/test-018attachments.rb | 6 ++++-- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/tests/test-016cuesheet.rb b/tests/test-016cuesheet.rb index 27a92b3a9..c57d27a2b 100644 --- a/tests/test-016cuesheet.rb +++ b/tests/test-016cuesheet.rb @@ -6,7 +6,8 @@ class T_016cuesheet < Test end def run - merge("data/textsubs/vde.srt --chapters data/text/cuewithtags2.cue") + merge("--sub-charset 0:ISO-8859-1 data/textsubs/vde.srt " + + "--chapters data/text/cuewithtags2.cue") return hash_tmp end end diff --git a/tests/test-017chapters.rb b/tests/test-017chapters.rb index 490fc550d..a0fb9078b 100644 --- a/tests/test-017chapters.rb +++ b/tests/test-017chapters.rb @@ -7,9 +7,11 @@ class T_017chapters < Test end def run - merge("data/textsubs/vde.srt --chapters data/text/shortchaps.txt") + merge("--sub-charset 0:ISO-8859-1 data/textsubs/vde.srt " + + "--chapters data/text/shortchaps.txt") hash = hash_tmp - merge("data/textsubs/vde.srt --chapters data/text/vmap.chapters.xml") + merge("--sub-charset 0:ISO-8859-1 data/textsubs/vde.srt " + + "--chapters data/text/vmap.chapters.xml") return hash + "-" + hash_tmp end end diff --git a/tests/test-018attachments.rb b/tests/test-018attachments.rb index 07fd0afa6..c41cffd7b 100644 --- a/tests/test-018attachments.rb +++ b/tests/test-018attachments.rb @@ -6,11 +6,13 @@ class T_018attachments < Test end def run - merge("data/textsubs/vde.srt --attachment-description 'Dummy " + + merge("--sub-charset 0:ISO-8859-1 data/textsubs/vde.srt " + + "--attachment-description 'Dummy " + "description' --attachment-mime-type text/plain --attach-file " + "data/textsubs/vde.srt") hash = hash_tmp - merge("data/textsubs/vde.srt --attachment-description 'automatic MIME " + + merge("--sub-charset 0:ISO-8859-1 data/textsubs/vde.srt " + + "--attachment-description 'automatic MIME " + "type test' --attach-file data/text/cuewithtags2.cue") return hash + "-" + hash_tmp end