From 84e25ea39f17013865ec9a70a06b65863830ddc5 Mon Sep 17 00:00:00 2001 From: Moritz Bunkus Date: Wed, 29 Sep 2004 09:41:22 +0000 Subject: [PATCH] Merged 2239 --- tests/results.txt | 2 ++ tests/test-049ass.rb | 13 +++++++++++++ tests/test-050X_ass.rb | 18 ++++++++++++++++++ 3 files changed, 33 insertions(+) create mode 100644 tests/test-049ass.rb create mode 100644 tests/test-050X_ass.rb diff --git a/tests/results.txt b/tests/results.txt index d94edcd70..c2576b5a8 100644 --- a/tests/results.txt +++ b/tests/results.txt @@ -44,4 +44,6 @@ T_045X_ssa:702cb49d23f4d1985471c1dc46053576:passed:20040920-190646 T_046X_chapters:f240df9a576de2cc683e1f4ef0fa6e23:passed:20040920-192348 T_047X_tags:3f151ff52e43ed1df3c173e5b0c78ee2:passed:20040920-192348 T_048X_chapters_ogmstyle:5ecb42d20d78b4f73fc2340a2e4f0803:passed:20040920-192349 +T_049ass:bc65c6cc7d5d9bb21ca6b4d1c19c6fa1:passed:20040929-113852 +T_050X_ass:6aeb4aef55511282630e9f0e69777c46-6aeb4aef55511282630e9f0e69777c46:passed:20040929-113852 T_200mp2_from_mp4:d8b1beaaec801d787389ff210b605948:passed:20040917-185156 diff --git a/tests/test-049ass.rb b/tests/test-049ass.rb new file mode 100644 index 000000000..f95a58fea --- /dev/null +++ b/tests/test-049ass.rb @@ -0,0 +1,13 @@ +#!/usr/bin/ruby -w + +class T_049ass < Test + def description + return "mkvmerge / ASS subtitles / in(ASS)" + end + + def run + merge("--sub-charset 0:ISO-8859-1 data/textsubs/11.Magyar.ass") + return hash_tmp + end +end + diff --git a/tests/test-050X_ass.rb b/tests/test-050X_ass.rb new file mode 100644 index 000000000..493e7fea4 --- /dev/null +++ b/tests/test-050X_ass.rb @@ -0,0 +1,18 @@ +#!/usr/bin/ruby -w + +class T_050X_ass < Test + def description + return "mkvextract / ASS subtitles / out(ASS)" + end + + def run + my_hash = hash_file("data/textsubs/11.Magyar.ass") + my_tmp = tmp + merge("--sub-charset 0:ISO-8859-1 data/textsubs/11.Magyar.ass") + @tmp = nil + xtr_tracks(my_tmp, "-c ISO-8859-1 1:#{tmp}") + File.unlink(my_tmp) + return my_hash + "-" + hash_tmp + end +end +