Move rcfiles of tester in a subdirectory.

tester/Makefile.am

@@ -1,6 +1,4 @@
-EXTRA_DIST=	empty_rc laure_rc marie_early_rc marie_no_sdp_rc marie_rc multi_account_lrc pauline_alt_rc \
-		marie_remote_rc marie_remote_https_rc marie_remote_404_rc marie_remote_invalid_rc \
-		pauline_rc pauline_wild_rc pauline_tcp_rc tester_hosts sounds images certificates
+EXTRA_DIST=	tester_hosts sounds images certificates rcfiles
 
 
 if BUILD_CUNIT_TESTS

tester/liblinphone_tester.c

@@ -184,6 +184,7 @@ LinphoneCoreManager *get_manager(LinphoneCore *lc){
 LinphoneCoreManager* linphone_core_manager_new2(const char* rc_file, int check_for_proxies) {
 	LinphoneCoreManager* mgr= ms_new0(LinphoneCoreManager,1);
 	LinphoneProxyConfig* proxy;
+	char *rc_path = NULL;
 	int proxy_count;
 	int retry=0;
 
@@ -203,7 +204,8 @@ LinphoneCoreManager* linphone_core_manager_new2(const char* rc_file, int check_f
 	mgr->v_table.configuring_status=linphone_configuration_status;
 	
 	reset_counters(&mgr->stat);
-	mgr->lc=configure_lc_from(&mgr->v_table, liblinphone_tester_file_prefix, rc_file, mgr);
+	if (rc_file) rc_path = ms_strdup_printf("rcfiles/%s", rc_file);
+	mgr->lc=configure_lc_from(&mgr->v_table, liblinphone_tester_file_prefix, rc_path, mgr);
 	/*CU_ASSERT_EQUAL(ms_list_size(linphone_core_get_proxy_config_list(lc)),proxy_count);*/
 	if (check_for_proxies && rc_file) /**/
 		proxy_count=ms_list_size(linphone_core_get_proxy_config_list(mgr->lc));
@@ -222,6 +224,7 @@ LinphoneCoreManager* linphone_core_manager_new2(const char* rc_file, int check_f
 		mgr->identity = linphone_address_new(linphone_proxy_config_get_identity(proxy));
 		linphone_address_clean(mgr->identity);
 	}
+	if (rc_path) ms_free(rc_path);
 	return mgr;
 }
 

tester/register_tester.c

@@ -365,7 +365,7 @@ static void authenticated_register_with_wrong_credentials_without_403() {
 	authenticated_register_with_wrong_credentials_with_params("tester-no-403");
 }
 static LinphoneCoreManager* configure_lcm(void) {
-	LinphoneCoreManager *mgr=linphone_core_manager_new( "multi_account_lrc");
+	LinphoneCoreManager *mgr=linphone_core_manager_new( "multi_account_rc");
 	stats *counters=&mgr->stat;
 	CU_ASSERT_TRUE(wait_for(mgr->lc,mgr->lc,&counters->number_of_LinphoneRegistrationOk,ms_list_size(linphone_core_get_proxy_config_list(mgr->lc))));
 	return mgr;
@@ -487,7 +487,7 @@ static void io_recv_error_late_recovery(){
 	int number_of_udp_proxy=0;
 	MSList* lcs;
 
-	mgr=linphone_core_manager_new2( "multi_account_lrc",FALSE); /*to make sure iterates are not call yet*/
+	mgr=linphone_core_manager_new2( "multi_account_rc",FALSE); /*to make sure iterates are not call yet*/
 	lc=mgr->lc;
 	sal_set_refresher_retry_after(lc->sal,1000);
 	counters=&mgr->stat;