--- a/persistentstorage/centralrepository/group/bld.inf Fri May 14 13:32:10 2010 +0100
+++ b/persistentstorage/centralrepository/group/bld.inf Thu Jul 01 17:02:22 2010 +0100
@@ -39,7 +39,12 @@
PRJ_TESTEXPORTS
// Stub sis file required by various tests.
-../test/testexecute/SWI/data/centrepswiteststub.SIS z:/system/install/centrepswiteststub.sis
+
+#ifdef __SERIES60_
+../test/testexecute/SWI/data/rnd_sis/centrepswiteststub.sis z:/system/install/centrepswiteststub.sis
+#else
+../test/testexecute/SWI/data/techview_sis/centrepswiteststub.sis z:/system/install/centrepswiteststub.sis
+#endif //__SERIES60_
CentralRepositoryTests.bat /epoc32/data/z/system/test/centralrepositorytests.bat
centrepswiteststub.iby /epoc32/rom/include/centrepswiteststub.iby
@@ -170,10 +175,18 @@
../test/sw.txt z:/resource/versions/sw.txt
../test/00000003.txt z:/private/102081e4/00000003.txt
../test/00112273.txt z:/private/10202be9/00112273.txt
-../test/RF1.sis z:/private/10202be9/rf1.sis
-../test/RF2.sis z:/private/10202be9/rf2.sis
-../test/RF3.sis z:/private/10202be9/rf3.sis
-../test/RF4.sis z:/private/10202be9/rf4.sis
+
+#ifdef __SERIES60_
+../test/rnd_RF1.sis z:/private/10202be9/rf1.sis
+../test/rnd_RF2.sis z:/private/10202be9/rf2.sis
+../test/rnd_RF3.sis z:/private/10202be9/rf3.sis
+../test/rnd_RF4.sis z:/private/10202be9/rf4.sis
+#else
+../test/techview_RF1.sis z:/private/10202be9/rf1.sis
+../test/techview_RF2.sis z:/private/10202be9/rf2.sis
+../test/techview_RF3.sis z:/private/10202be9/rf3.sis
+../test/techview_RF4.sis z:/private/10202be9/rf4.sis
+#endif //__SERIES60_
#ifdef SYMBIAN_CENTREP_SUPPORT_MULTIROFS
// Multi Rofs testing
@@ -1438,26 +1451,38 @@
t_cenrep_meta.mmp
t_cenrep_rfs.mmp
t_cenrep_back_rest.mmp
-t_cenrep_back_rest_defect.mmp manual
+#ifdef CENTREP_MW_TESTS
+ t_cenrep_back_rest_defect.mmp manual
+#endif // CENTREP_MW_TESTS
t_cenrep_back_rest_delete.mmp
t_oomcenrepsrv.mmp
t_processkillprocess.mmp support
#ifdef SYMBIAN_BAFL_SYSUTIL
- t_cenrep_fota_tvem1.mmp manual
- t_cenrep_fota_tvem2.mmp manual
- t_cenrep_fota_tvem3.mmp manual
- t_cenrep_fota_txtem1.mmp manual
- t_cenrep_fota_txtem2.mmp manual
- t_cenrep_fotaUT.mmp manual
+ #ifdef CENTREP_MW_TESTS
+ t_cenrep_fota_tvem1.mmp manual
+ #endif // CENTREP_MW_TESTS
+
+ t_cenrep_fota_tvem2.mmp manual
- #ifdef __CENTREP_SERVER_PERFTEST__
- t_cenrep_fota_perf1.mmp manual
- t_cenrep_fota_perf2.mmp manual
- #endif // __CENTREP_SERVER_PERFTEST__
+ #ifdef CENTREP_MW_TESTS
+ t_cenrep_fota_tvem3.mmp manual
+ t_cenrep_fota_txtem1.mmp manual
+ t_cenrep_fota_txtem2.mmp manual
+ t_cenrep_fotaUT.mmp manual
+ #endif // CENTREP_MW_TESTS
- t_cenrep_fota_hw_setup.mmp manual
- t_cenrep_fota_hw_tests.mmp manual
+ #ifdef __CENTREP_SERVER_PERFTEST__
+ #ifdef CENTREP_MW_TESTS
+ t_cenrep_fota_perf1.mmp manual
+ #endif // CENTREP_MW_TESTS
+ t_cenrep_fota_perf2.mmp manual
+ #endif // __CENTREP_SERVER_PERFTEST__
+
+ #ifdef CENTREP_MW_TESTS
+ t_cenrep_fota_hw_setup.mmp manual
+ t_cenrep_fota_hw_tests.mmp manual
+ #endif // CENTREP_MW_TESTS
#endif // SYMBIAN_BAFL_SYSUTIL