From 3f90f37ada9e8e678eb6600863a3edbc98791c09 Mon Sep 17 00:00:00 2001
From: Guillaume BIENKOWSKI
 <guillaume.bienkowski@belledonne-communications.com>
Date: Fri, 21 Nov 2014 14:28:47 +0100
Subject: [PATCH] Update linphone and fix tests names to remove unsupported
 characters (it is not exhaustive...)

---
 submodules/linphone                              |  2 +-
 .../mediastream_tester_Tests.m                   | 16 ++++++++++++++--
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/submodules/linphone b/submodules/linphone
index 1a2125b58..a8e2461db 160000
--- a/submodules/linphone
+++ b/submodules/linphone
@@ -1 +1 @@
-Subproject commit 1a2125b588ca36a7274061ddcd60afe81330eab4
+Subproject commit a8e2461db5cc79eda8ef6737b4112a5b3b0f33d6
diff --git a/submodules/mediastream-tester Tests/mediastream_tester_Tests.m b/submodules/mediastream-tester Tests/mediastream_tester_Tests.m
index 9fd8cf8d9..53c7f5322 100644
--- a/submodules/mediastream-tester Tests/mediastream_tester_Tests.m	
+++ b/submodules/mediastream-tester Tests/mediastream_tester_Tests.m	
@@ -25,8 +25,19 @@
     return skipped_suites;
 }
 
++ (NSString*)safeifyTestString:(NSString*)testString{
+    NSArray* invalidChars= @[@"[", @"]", @" ", @"-", @"."];
+    NSString* safeString = testString;
+
+    for (NSString* c in invalidChars) {
+        safeString = [safeString stringByReplacingOccurrencesOfString:c withString:@"_"];
+    }
+    return safeString;
+}
+
 + (void)initialize {
     mediastreamer2_tester_init();
+    ortp_set_log_level_mask(ORTP_MESSAGE|ORTP_WARNING|ORTP_ERROR|ORTP_FATAL);
 
     int count = mediastreamer2_tester_nb_test_suites();
     for (int i=0; i<count; i++) {
@@ -41,9 +52,10 @@
             if( [[mediastream_tester_Tests skippedSuites] containsObject:sSuite] ) continue;
 
             // prepend test_ so that it gets found by introspection
-            NSString* safesTest    = [sTest stringByReplacingOccurrencesOfString:@" " withString:@"_"];
-            NSString* safesSuite   = [sSuite stringByReplacingOccurrencesOfString:@" " withString:@"_"];
+            NSString* safesTest    = [self safeifyTestString:sTest];
+            NSString* safesSuite   = [self safeifyTestString:sSuite];
             NSString *selectorName = [NSString stringWithFormat:@"test_%@__%@", safesSuite, safesTest];
+            NSLog(@"Adding test: %@", selectorName);
             [mediastream_tester_Tests addInstanceMethodWithSelectorName:selectorName block:^(mediastream_tester_Tests* myself) {
                 [myself testForSuite:sSuite andTest:sTest];
             }];