Merged 2225

This commit is contained in:
Moritz Bunkus 2004-09-28 12:22:06 +00:00
parent 77bff649f6
commit c10da282d5
3 changed files with 10 additions and 5 deletions

View File

@ -6,7 +6,8 @@ class T_016cuesheet < Test
end end
def run 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 return hash_tmp
end end
end end

View File

@ -7,9 +7,11 @@ class T_017chapters < Test
end end
def run 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 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 return hash + "-" + hash_tmp
end end
end end

View File

@ -6,11 +6,13 @@ class T_018attachments < Test
end end
def run 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 " + "description' --attachment-mime-type text/plain --attach-file " +
"data/textsubs/vde.srt") "data/textsubs/vde.srt")
hash = hash_tmp 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") "type test' --attach-file data/text/cuewithtags2.cue")
return hash + "-" + hash_tmp return hash + "-" + hash_tmp
end end