From 754410e5058d72a3565f0da6a1a372593f4666dd Mon Sep 17 00:00:00 2001 From: Moritz Bunkus Date: Sun, 6 May 2012 19:28:00 +0200 Subject: [PATCH] Only use file name component for 'other_file:' identification output during test --- tests/results.txt | 2 +- tests/test-361file_concatenation.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/results.txt b/tests/results.txt index 99e5cf2b8..9b0641006 100644 --- a/tests/results.txt +++ b/tests/results.txt @@ -206,5 +206,5 @@ T_357segment_info:2d71cf1bd5f76518c50cd264c9bbca02-14d5941c82657b7b39cb9c1f93bf3 T_358usf:ed5c3f4942642971dc7b7cc9ff2e1c07:passed:20120329-142144:0.03867509 T_359split_parts:9957b93c496b1d21058c4dce51e11e9d+95b51d8b94bf77636fa4335717a9d92c+ok-921f0b8fc856c89e4a64f7753e574abf+ok-f6bd8166d0be64487b1d8ef23d323a2f+ok-0896cbcafd69f2ffe87a4e17821d48cc-f996f80ffe0bb16fa6b1ec483b0388ba-67c1352b46657f06fcbfc3bd1b9d505a-f7358de79e07de27bcff870cb7b2936b-e24955bd565390f9ae900e45e7871407-d0fc74b5e88bae541b010c79cbd7e90e-503bc29803a49df24c10236d437ced67-ok-ba9776caea8e59a7965a2903e1945002+ok-642d0c4c8db745aeaa479975b10936b3+ok:passed:20120331-133448:2.051927226 T_360X_chapters_hex_format:c49e086961b3ca8b77f525753d3912cf-3853793b0d88fc10efadb146ca948833:passed:20120404-152038:0.045443307 -T_361file_concatenation:2482794fcdcc83d5955a7fbda751b79c-2db61b8b9a6f7bee36ad9d7d260b6858-2db61b8b9a6f7bee36ad9d7d260b6858-cb53c1651de293f1951daec0bdeba51a-cb53c1651de293f1951daec0bdeba51a-cb53c1651de293f1951daec0bdeba51a-245037810fa42e4f7a685a802f68a3d1-0408ae98a65d899f9d62e3f4f44e385b-8bf0ee64b51f3c0cf9ade6666466357e-8bf0ee64b51f3c0cf9ade6666466357e-8bf0ee64b51f3c0cf9ade6666466357e-8bf0ee64b51f3c0cf9ade6666466357e-900d51324a15b56e0fcb0fe37954735f-59cf17f8f14c8cf64beeea497d541d77-f44803b98439b320582ec4bafafe27bf-f44803b98439b320582ec4bafafe27bf:passed:20120406-144928:15.270773675 +T_361file_concatenation:4051dcbcddbde799e7f93b4bb3617897-2db61b8b9a6f7bee36ad9d7d260b6858-2db61b8b9a6f7bee36ad9d7d260b6858-cb53c1651de293f1951daec0bdeba51a-cb53c1651de293f1951daec0bdeba51a-cb53c1651de293f1951daec0bdeba51a-245037810fa42e4f7a685a802f68a3d1-0408ae98a65d899f9d62e3f4f44e385b-8bf0ee64b51f3c0cf9ade6666466357e-8bf0ee64b51f3c0cf9ade6666466357e-8bf0ee64b51f3c0cf9ade6666466357e-8bf0ee64b51f3c0cf9ade6666466357e-900d51324a15b56e0fcb0fe37954735f-59cf17f8f14c8cf64beeea497d541d77-f44803b98439b320582ec4bafafe27bf-f44803b98439b320582ec4bafafe27bf:passed:20120406-144928:15.270773675 T_362xtr_avc:7e80cf1649489adf8f65a7dc8cef7387-ce680f3ae594f3842b638dcb2949e220:passed:20120416-153515:1.533142 diff --git a/tests/test-361file_concatenation.rb b/tests/test-361file_concatenation.rb index 3dc2fcca1..5d2c0c593 100644 --- a/tests/test-361file_concatenation.rb +++ b/tests/test-361file_concatenation.rb @@ -5,7 +5,7 @@ describe "mkvmerge / file concatenation, multi file I/O" files = (1..3).collect { |i| "data/vob/VTS_01_#{i}.VOB" } -test_identify files[0], :verbose => true +test_identify files[0], :verbose => true, :filter => lambda { |text| text.gsub(/other_file:[^ ]+\//, 'other_file:') } # These two must be equal. test_merge files[0], :exit_code => 1