--- a/networkingtestandutils/networkingintegrationtest/Group/bld.inf Tue Aug 31 16:45:15 2010 +0300
+++ b/networkingtestandutils/networkingintegrationtest/Group/bld.inf Wed Sep 01 12:33:58 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2001-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2001-2009 Nokia Corporation and/or its subsidiary(-ies).
// All rights reserved.
// This component and the accompanying materials are made available
// under the terms of "Eclipse Public License v1.0"
@@ -49,46 +49,6 @@
PRJ_TESTEXPORTS
-#ifdef SIROCCO_CODE_MIGRATION
-../it_script_files/itest_s1/cccccc00_itest1.cre /epoc32/release/wins/udeb/z/testdata/scripts/integration/cccccc00_itest1.cre
-../it_script_files/itest_s2/cccccc00_itest2.cre /epoc32/release/wins/udeb/z/testdata/scripts/integration/cccccc00_itest2.cre
-../it_script_files/itest_s3/cccccc00_itest3.cre /epoc32/release/wins/udeb/z/testdata/scripts/integration/cccccc00_itest3.cre
-../it_script_files/itest_s4/cccccc00_itest4.cre /epoc32/release/wins/udeb/z/testdata/scripts/integration/cccccc00_itest4.cre
-../it_script_files/itest_s5/cccccc00_itest5.cre /epoc32/release/wins/udeb/z/testdata/scripts/integration/cccccc00_itest5.cre
-#endif
-
-
-#ifdef SIROCCO_CODE_MIGRATION
-// s1 scripts
-../it_script_files/itest_s1.script /epoc32/release/wins/udeb/z/testdata/scripts/integration/itest_s1.script
-../it_script_files/itest_s1_manual_tcs.script /epoc32/release/wins/udeb/z/testdata/scripts/integration/itest_s1_manual_tcs.script
-../it_script_files/LogOn.script /epoc32/release/wins/udeb/z/testdata/scripts/integration/logon.script
-../it_script_files/itest_s1/itest_RConnection.script /epoc32/release/wins/udeb/z/testdata/scripts/integration/itest_s1/itest_rconnection.script
-../it_script_files/itest_s1/itest1_01_wlan.script /epoc32/release/wins/udeb/z/testdata/scripts/integration/itest_s1/itest1_01_wlan.script
-../it_script_files/itest_s1/itest1_02_wlan.script /epoc32/release/wins/udeb/z/testdata/scripts/integration/itest_s1/itest1_02_wlan.script
-../it_script_files/itest_s1/itest1_03_wlan.script /epoc32/release/wins/udeb/z/testdata/scripts/integration/itest_s1/itest1_03_wlan.script
-../it_script_files/itest_s1/itest1_04.script /epoc32/release/wins/udeb/z/testdata/scripts/integration/itest_s1/itest1_04.script
-../it_script_files/itest_s1/itest1_09.script /epoc32/release/wins/udeb/z/testdata/scripts/integration/itest_s1/itest1_09.script
-../it_script_files/itest_s1/itest1_10_wlan.script /epoc32/release/wins/udeb/z/testdata/scripts/integration/itest_s1/itest1_10_wlan.script
-../it_script_files/itest_s1/itest1_11.script /epoc32/release/wins/udeb/z/testdata/scripts/integration/itest_s1/itest1_11.script
-../it_script_files/itest_s1/itest1_12.script /epoc32/release/wins/udeb/z/testdata/scripts/integration/itest_s1/itest1_12.script
-../it_script_files/itest_s1/itest1_13_wlan.script /epoc32/release/wins/udeb/z/testdata/scripts/integration/itest_s1/itest1_13_wlan.script
-../it_script_files/itest_s1/itest1_14.script /epoc32/release/wins/udeb/z/testdata/scripts/integration/itest_s1/itest1_14.script
-../it_script_files/itest_s1/itest1_15.script /epoc32/release/wins/udeb/z/testdata/scripts/integration/itest_s1/itest1_15.script
-../it_script_files/itest_s1/itest1_16.script /epoc32/release/wins/udeb/z/testdata/scripts/integration/itest_s1/itest1_16.script
-../it_script_files/itest_s1/itest1_17_wlan.script /epoc32/release/wins/udeb/z/testdata/scripts/integration/itest_s1/itest1_17_wlan.script
-../it_script_files/itest_s1/ipv4_wlan.ini /epoc32/release/wins/udeb/z/testdata/configs/integration/itest_s1/ipv4_wlan.ini
-../it_script_files/itest_s1/ipv6_wlan.ini /epoc32/release/wins/udeb/z/testdata/configs/integration/itest_s1/ipv6_wlan.ini
-../it_script_files/itest_s1/client_timeout.ini /epoc32/release/wins/udeb/z/testdata/configs/integration/itest_s1/client_timeout.ini
-../it_script_files/itest_s1/genconn.ini /epoc32/release/wins/udeb/z/testdata/configs/integration/itest_s1/genconn.ini
-../it_script_files/itest_s1/itest.ini /epoc32/release/wins/udeb/z/testdata/configs/integration/itest_s1/itest.ini
-../it_script_files/itest_s1/rnif_timeout.ini /epoc32/release/wins/udeb/z/testdata/configs/integration/itest_s1/rnif_timeout.ini
-../it_script_files/itest_s1/load_csd_wlan.script /epoc32/release/wins/udeb/z/testdata/scripts/integration/itest_s1/load_csd_wlan.script
-../it_script_files/itest_s1/n6210.script /epoc32/release/wins/udeb/z/testdata/scripts/integration/itest_s1/n6210.script
-../it_script_files/itest_s1/itest_load.script /epoc32/release/wins/udeb/z/testdata/scripts/integration/itest_s1/itest_load.script
-../it_script_files/itest_s1/big_ipv4.ini /epoc32/release/wins/udeb/z/testdata/configs/integration/itest_s1/big_ipv4.ini
-../it_script_files/itest_s1/te_teststeps.ini /epoc32/release/wins/udeb/z/testdata/configs/integration/itest_s1/te_teststeps.ini
-#else
// s1 scripts
../it_script_files/itest_s1.script /epoc32/release/wins/udeb/z/testdata/scripts/integration/itest_s1.script
../it_script_files/itest_s1_manual_tcs.script /epoc32/release/wins/udeb/z/testdata/scripts/integration/itest_s1_manual_tcs.script
@@ -121,7 +81,8 @@
../it_script_files/itest_s1/big_ipv4.ini /epoc32/release/wins/udeb/z/testdata/configs/integration/itest_s1/big_ipv4.ini
../it_script_files/itest_s1/ipsec_csd.xml /epoc32/release/wins/udeb/z/testdata/configs/integration/itest_s1/ipsec_csd.xml
../it_script_files/itest_s1/te_teststeps.ini /epoc32/release/wins/udeb/z/testdata/configs/integration/itest_s1/te_teststeps.ini
-#endif
+
+
../it_script_files/itest_s1.script /epoc32/release/winscw/udeb/z/testdata/scripts/integration/itest_s1.script
../it_script_files/LogOn.script /epoc32/release/winscw/udeb/z/testdata/scripts/integration/logon.script
@@ -156,24 +117,15 @@
-#ifdef SIROCCO_CODE_MIGRATION
+
// s2 scripts
../it_script_files/itest_s2.script /epoc32/release/wins/udeb/z/testdata/scripts/integration/itest_s2.script
-../it_script_files/itest_s2/itest2_01_wlan.script /epoc32/release/wins/udeb/z/testdata/scripts/integration/itest_s2/itest2_01_wlan.script
-../it_script_files/itest_s2/ipv4_wlan.ini /epoc32/release/wins/udeb/z/testdata/configs/integration/itest_s2/ipv4_wlan.ini
-../it_script_files/itest_s2/client_timeout.ini /epoc32/release/wins/udeb/z/testdata/configs/integration/itest_s2/client_timeout.ini
-../it_script_files/itest_s2/itest.ini /epoc32/release/wins/udeb/z/testdata/configs/integration/itest_s2/itest.ini
-../it_script_files/itest_s2/load_hscsd_wlan.script /epoc32/release/wins/udeb/z/testdata/scripts/integration/itest_s2/load_hscsd_wlan.script
-#else
-../it_script_files/itest_s2.script /epoc32/release/wins/udeb/z/testdata/scripts/integration/itest_s2.script
../it_script_files/itest_s2/itest2_01.script /epoc32/release/wins/udeb/z/testdata/scripts/integration/itest_s2/itest2_01.script
../it_script_files/itest_s2/ipv4.ini /epoc32/release/wins/udeb/z/testdata/configs/integration/itest_s2/ipv4.ini
../it_script_files/itest_s2/client_timeout.ini /epoc32/release/wins/udeb/z/testdata/configs/integration/itest_s2/client_timeout.ini
../it_script_files/itest_s2/itest.ini /epoc32/release/wins/udeb/z/testdata/configs/integration/itest_s2/itest.ini
../it_script_files/itest_s2/load_hscsd.script /epoc32/release/wins/udeb/z/testdata/scripts/integration/itest_s2/load_hscsd.script
../it_script_files/itest_s2/hscsd.xml /epoc32/release/wins/udeb/z/testdata/configs/integration/itest_s2/hscsd.xml
-#endif
-
../it_script_files/itest_s2.script /epoc32/release/winscw/udeb/z/testdata/scripts/integration/itest_s2.script
../it_script_files/itest_s2/itest2_01.script /epoc32/release/winscw/udeb/z/testdata/scripts/integration/itest_s2/itest2_01.script
@@ -183,38 +135,9 @@
../it_script_files/itest_s2/load_hscsd.script /epoc32/release/winscw/udeb/z/testdata/scripts/integration/itest_s2/load_hscsd.script
../it_script_files/itest_s2/hscsd.xml /epoc32/release/winscw/udeb/z/testdata/configs/integration/itest_s2/hscsd.xml
-#ifdef SIROCCO_CODE_MIGRATION
// s3 scripts
../it_script_files/itest_s3.script /epoc32/release/wins/udeb/z/testdata/scripts/integration/itest_s3.script
../it_script_files/itest_s3_manual_tcs.script /epoc32/release/wins/udeb/z/testdata/scripts/integration/itest_s3_manual_tcs.script
-../it_script_files/itest_s3/itest3_01_wlan.script /epoc32/release/wins/udeb/z/testdata/scripts/integration/itest_s3/itest3_01_wlan.script
-../it_script_files/itest_s3/itest3_02_wlan.script /epoc32/release/wins/udeb/z/testdata/scripts/integration/itest_s3/itest3_02_wlan.script
-../it_script_files/itest_s3/itest3_03.script /epoc32/release/wins/udeb/z/testdata/scripts/integration/itest_s3/itest3_03.script
-../it_script_files/itest_s3/itest3_04_wlan.script /epoc32/release/wins/udeb/z/testdata/scripts/integration/itest_s3/itest3_04_wlan.script
-../it_script_files/itest_s3/itest3_05_wlan.script /epoc32/release/wins/udeb/z/testdata/scripts/integration/itest_s3/itest3_05_wlan.script
-../it_script_files/itest_s3/itest3_05b.script /epoc32/release/wins/udeb/z/testdata/scripts/integration/itest_s3/itest3_05b.script
-../it_script_files/itest_s3/itest3_05c_wlan.script /epoc32/release/wins/udeb/z/testdata/scripts/integration/itest_s3/itest3_05c_wlan.script
-../it_script_files/itest_s3/itest3_09_wlan.script /epoc32/release/wins/udeb/z/testdata/scripts/integration/itest_s3/itest3_09_wlan.script
-../it_script_files/itest_s3/itest3_10_wlan.script /epoc32/release/wins/udeb/z/testdata/scripts/integration/itest_s3/itest3_10_wlan.script
-../it_script_files/itest_s3/itest3_11.script /epoc32/release/wins/udeb/z/testdata/scripts/integration/itest_s3/itest3_11.script
-../it_script_files/itest_s3/itest3_12_wlan.script /epoc32/release/wins/udeb/z/testdata/scripts/integration/itest_s3/itest3_12_wlan.script
-../it_script_files/itest_s3/itest3_13_wlan.script /epoc32/release/wins/udeb/z/testdata/scripts/integration/itest_s3/itest3_13_wlan.script
-../it_script_files/itest_s3/itest3_14_wlan.script /epoc32/release/wins/udeb/z/testdata/scripts/integration/itest_s3/itest3_14_wlan.script
-../it_script_files/itest_s3/itest3_15.script /epoc32/release/wins/udeb/z/testdata/scripts/integration/itest_s3/itest3_15.script
-../it_script_files/itest_s3/itest3_16_wlan.script /epoc32/release/wins/udeb/z/testdata/scripts/integration/itest_s3/itest3_16_wlan.script
-../it_script_files/itest_s3/itest3_17_wlan.script /epoc32/release/wins/udeb/z/testdata/scripts/integration/itest_s3/itest3_17_wlan.script
-../it_script_files/itest_s3/ipv4_wlan.ini /epoc32/release/wins/udeb/z/testdata/configs/integration/itest_s3/ipv4_wlan.ini
-../it_script_files/itest_s3/ipv6_wlan.ini /epoc32/release/wins/udeb/z/testdata/configs/integration/itest_s3/ipv6_wlan.ini
-../it_script_files/itest_s3/client_timeout.ini /epoc32/release/wins/udeb/z/testdata/configs/integration/itest_s3/client_timeout.ini
-../it_script_files/itest_s3/route_timeout.ini /epoc32/release/wins/udeb/z/testdata/configs/integration/itest_s3/route_timeout.ini
-../it_script_files/itest_s3/genconn.ini /epoc32/release/wins/udeb/z/testdata/configs/integration/itest_s3/genconn.ini
-../it_script_files/itest_s3/itest.ini /epoc32/release/wins/udeb/z/testdata/configs/integration/itest_s3/itest.ini
-../it_script_files/itest_s3/rnif_timeout.ini /epoc32/release/wins/udeb/z/testdata/configs/integration/itest_s3/rnif_timeout.ini
-../it_script_files/itest_s3/load_gprs_wlan.script /epoc32/release/wins/udeb/z/testdata/scripts/integration/itest_s3/load_gprs_wlan.script
-../it_script_files/itest_s3/te_teststeps.ini /epoc32/release/wins/udeb/z/testdata/configs/integration/itest_s3/te_teststeps.ini
-#else
-../it_script_files/itest_s3.script /epoc32/release/wins/udeb/z/testdata/scripts/integration/itest_s3.script
-../it_script_files/itest_s3_manual_tcs.script /epoc32/release/wins/udeb/z/testdata/scripts/integration/itest_s3_manual_tcs.script
../it_script_files/itest_s3/itest3_01.script /epoc32/release/wins/udeb/z/testdata/scripts/integration/itest_s3/itest3_01.script
../it_script_files/itest_s3/itest3_02.script /epoc32/release/wins/udeb/z/testdata/scripts/integration/itest_s3/itest3_02.script
../it_script_files/itest_s3/itest3_03.script /epoc32/release/wins/udeb/z/testdata/scripts/integration/itest_s3/itest3_03.script
@@ -241,7 +164,7 @@
../it_script_files/itest_s3/load_gprs.script /epoc32/release/wins/udeb/z/testdata/scripts/integration/itest_s3/load_gprs.script
../it_script_files/itest_s3/gprs.xml /epoc32/release/wins/udeb/z/testdata/configs/integration/itest_s3/gprs.xml
../it_script_files/itest_s3/te_teststeps.ini /epoc32/release/wins/udeb/z/testdata/configs/integration/itest_s3/te_teststeps.ini
-#endif
+
../it_script_files/itest_s3.script /epoc32/release/winscw/udeb/z/testdata/scripts/integration/itest_s3.script
../it_script_files/itest_s3/itest3_01.script /epoc32/release/winscw/udeb/z/testdata/scripts/integration/itest_s3/itest3_01.script
@@ -272,39 +195,10 @@
../it_script_files/itest_s3/gprs.xml /epoc32/release/winscw/udeb/z/testdata/configs/integration/itest_s3/gprs.xml
../it_script_files/itest_s3/te_teststeps.ini /epoc32/release/winscw/udeb/z/testdata/configs/integration/itest_s3/te_teststeps.ini
-#ifdef SIROCCO_CODE_MIGRATION
+
// s4 scripts
../it_script_files/itest_s4.script /epoc32/release/wins/udeb/z/testdata/scripts/integration/itest_s4.script
../it_script_files/itest_s4_manual_tcs.script /epoc32/release/wins/udeb/z/testdata/scripts/integration/itest_s4_manual_tcs.script
-../it_script_files/itest_s4/itest4_01_wlan.script /epoc32/release/wins/udeb/z/testdata/scripts/integration/itest_s4/itest4_01_wlan.script
-../it_script_files/itest_s4/itest4_02.script /epoc32/release/wins/udeb/z/testdata/scripts/integration/itest_s4/itest4_02.script
-../it_script_files/itest_s4/itest4_03.script /epoc32/release/wins/udeb/z/testdata/scripts/integration/itest_s4/itest4_03.script
-../it_script_files/itest_s4/itest4_04.script /epoc32/release/wins/udeb/z/testdata/scripts/integration/itest_s4/itest4_04.script
-../it_script_files/itest_s4/itest4_06_wlan.script /epoc32/release/wins/udeb/z/testdata/scripts/integration/itest_s4/itest4_06_wlan.script
-../it_script_files/itest_s4/itest4_07.script /epoc32/release/wins/udeb/z/testdata/scripts/integration/itest_s4/itest4_07.script
-../it_script_files/itest_s4/itest4_08.script /epoc32/release/wins/udeb/z/testdata/scripts/integration/itest_s4/itest4_08.script
-
-../it_script_files/itest_s4/itest4_09.script /epoc32/release/wins/udeb/z/testdata/scripts/integration/itest_s4/itest4_09.script
-../it_script_files/itest_s4/itest4_10.script /epoc32/release/wins/udeb/z/testdata/scripts/integration/itest_s4/itest4_10.script
-../it_script_files/itest_s4/itest4_11_wlan.script /epoc32/release/wins/udeb/z/testdata/scripts/integration/itest_s4/itest4_11_wlan.script
-../it_script_files/itest_s4/itest4_12.script /epoc32/release/wins/udeb/z/testdata/scripts/integration/itest_s4/itest4_12.script
-../it_script_files/itest_s4/itest4_13.script /epoc32/release/wins/udeb/z/testdata/scripts/integration/itest_s4/itest4_13.script
-../it_script_files/itest_s4/itest4_14.script /epoc32/release/wins/udeb/z/testdata/scripts/integration/itest_s4/itest4_14.script
-../it_script_files/itest_s4/itest4_15.script /epoc32/release/wins/udeb/z/testdata/scripts/integration/itest_s4/itest4_15.script
-../it_script_files/itest_s4/itest4_16.script /epoc32/release/wins/udeb/z/testdata/scripts/integration/itest_s4/itest4_16.script
-../it_script_files/itest_s4/itest4_17_wlan.script /epoc32/release/wins/udeb/z/testdata/scripts/integration/itest_s4/itest4_17_wlan.script
-../it_script_files/itest_s4/ipv4_wlan.ini /epoc32/release/wins/udeb/z/testdata/configs/integration/itest_s4/ipv4_wlan.ini
-../it_script_files/itest_s4/ipv6_wlan.ini /epoc32/release/wins/udeb/z/testdata/configs/integration/itest_s4/ipv6_wlan.ini
-../it_script_files/itest_s4/client_timeout.ini /epoc32/release/wins/udeb/z/testdata/configs/integration/itest_s4/client_timeout.ini
-../it_script_files/itest_s4/genconn.ini /epoc32/release/wins/udeb/z/testdata/configs/integration/itest_s4/genconn.ini
-../it_script_files/itest_s4/genconn-psd.ini /epoc32/release/wins/udeb/z/testdata/configs/integration/itest_s4/genconn-psd.ini
-../it_script_files/itest_s4/itest.ini /epoc32/release/wins/udeb/z/testdata/configs/integration/itest_s4/itest.ini
-../it_script_files/itest_s4/rnif_timeout.ini /epoc32/release/wins/udeb/z/testdata/configs/integration/itest_s4/rnif_timeout.ini
-../it_script_files/itest_s4/te_teststeps.ini /epoc32/release/wins/udeb/z/testdata/configs/integration/itest_s4/te_teststeps.ini
-../it_script_files/itest_s4/route_timeout.ini /epoc32/release/wins/udeb/z/testdata/configs/integration/itest_s4/route_timeout.ini
-#else
-../it_script_files/itest_s4.script /epoc32/release/wins/udeb/z/testdata/scripts/integration/itest_s4.script
-../it_script_files/itest_s4_manual_tcs.script /epoc32/release/wins/udeb/z/testdata/scripts/integration/itest_s4_manual_tcs.script
../it_script_files/itest_s4/itest4_01.script /epoc32/release/wins/udeb/z/testdata/scripts/integration/itest_s4/itest4_01.script
../it_script_files/itest_s4/itest4_02.script /epoc32/release/wins/udeb/z/testdata/scripts/integration/itest_s4/itest4_02.script
../it_script_files/itest_s4/itest4_03.script /epoc32/release/wins/udeb/z/testdata/scripts/integration/itest_s4/itest4_03.script
@@ -331,7 +225,8 @@
../it_script_files/itest_s4/rnif_timeout.ini /epoc32/release/wins/udeb/z/testdata/configs/integration/itest_s4/rnif_timeout.ini
../it_script_files/itest_s4/te_teststeps.ini /epoc32/release/wins/udeb/z/testdata/configs/integration/itest_s4/te_teststeps.ini
../it_script_files/itest_s4/route_timeout.ini /epoc32/release/wins/udeb/z/testdata/configs/integration/itest_s4/route_timeout.ini
-#endif
+
+
../it_script_files/itest_s4.script /epoc32/release/winscw/udeb/z/testdata/scripts/integration/itest_s4.script
../it_script_files/itest_s4/itest4_01.script /epoc32/release/winscw/udeb/z/testdata/scripts/integration/itest_s4/itest4_01.script
@@ -362,46 +257,10 @@
../it_script_files/itest_s4/te_teststeps.ini /epoc32/release/winscw/udeb/z/testdata/configs/integration/itest_s4/te_teststeps.ini
../it_script_files/itest_s4/route_timeout.ini /epoc32/release/winscw/udeb/z/testdata/configs/integration/itest_s4/route_timeout.ini
-#ifdef SIROCCO_CODE_MIGRATION
+
// s5 scripts
../it_script_files/itest_s5.script /epoc32/release/wins/udeb/z/testdata/scripts/integration/itest_s5.script
../it_script_files/itest_s5_manual_tcs.script /epoc32/release/wins/udeb/z/testdata/scripts/integration/itest_s5_manual_tcs.script
-../it_script_files/itest_s5/itest5_01_wlan.script /epoc32/release/wins/udeb/z/testdata/scripts/integration/itest_s5/itest5_01_wlan.script
-../it_script_files/itest_s5/itest5_02.script /epoc32/release/wins/udeb/z/testdata/scripts/integration/itest_s5/itest5_02.script
-../it_script_files/itest_s5/itest5_03_wlan.script /epoc32/release/wins/udeb/z/testdata/scripts/integration/itest_s5/itest5_03_wlan.script
-../it_script_files/itest_s5/itest5_04.script /epoc32/release/wins/udeb/z/testdata/scripts/integration/itest_s5/itest5_04.script
-../it_script_files/itest_s5/itest5_05.script /epoc32/release/wins/udeb/z/testdata/scripts/integration/itest_s5/itest5_05.script
-../it_script_files/itest_s5/itest5_05b.script /epoc32/release/wins/udeb/z/testdata/scripts/integration/itest_s5/itest5_05b.script
-../it_script_files/itest_s5/itest5_05c.script /epoc32/release/wins/udeb/z/testdata/scripts/integration/itest_s5/itest5_05c.script
-../it_script_files/itest_s5/itest5_06.script /epoc32/release/wins/udeb/z/testdata/scripts/integration/itest_s5/itest5_06.script
-../it_script_files/itest_s5/itest5_07.script /epoc32/release/wins/udeb/z/testdata/scripts/integration/itest_s5/itest5_07.script
-../it_script_files/itest_s5/itest5_08.script /epoc32/release/wins/udeb/z/testdata/scripts/integration/itest_s5/itest5_08.script
-../it_script_files/itest_s5/itest5_09.script /epoc32/release/wins/udeb/z/testdata/scripts/integration/itest_s5/itest5_09.script
-../it_script_files/itest_s5/itest5_10_wlan.script /epoc32/release/wins/udeb/z/testdata/scripts/integration/itest_s5/itest5_10_wlan.script
-../it_script_files/itest_s5/itest5_11.script /epoc32/release/wins/udeb/z/testdata/scripts/integration/itest_s5/itest5_11.script
-../it_script_files/itest_s5/itest5_12_wlan.script /epoc32/release/wins/udeb/z/testdata/scripts/integration/itest_s5/itest5_12_wlan.script
-../it_script_files/itest_s5/itest5_13_wlan.script /epoc32/release/wins/udeb/z/testdata/scripts/integration/itest_s5/itest5_13_wlan.script
-../it_script_files/itest_s5/itest5_14.script /epoc32/release/wins/udeb/z/testdata/scripts/integration/itest_s5/itest5_14.script
-../it_script_files/itest_s5/itest5_15.script /epoc32/release/wins/udeb/z/testdata/scripts/integration/itest_s5/itest5_15.script
-../it_script_files/itest_s5/itest5_16.script /epoc32/release/wins/udeb/z/testdata/scripts/integration/itest_s5/itest5_16.script
-../it_script_files/itest_s5/itest5_17_wlan.script /epoc32/release/wins/udeb/z/testdata/scripts/integration/itest_s5/itest5_17_wlan.script
-
-../it_script_files/itest_s5/itest5_18.script /epoc32/release/wins/udeb/z/testdata/scripts/integration/itest_s5/itest5_18.script
-../it_script_files/itest_s5/itest5_19.script /epoc32/release/wins/udeb/z/testdata/scripts/integration/itest_s5/itest5_19.script
-
-
-../it_script_files/itest_s5/ipv4_wlan.ini /epoc32/release/wins/udeb/z/testdata/configs/integration/itest_s5/ipv4_wlan.ini
-../it_script_files/itest_s5/ipv6_wlan.ini /epoc32/release/wins/udeb/z/testdata/configs/integration/itest_s5/ipv6_wlan.ini
-../it_script_files/itest_s5/client_timeout.ini /epoc32/release/wins/udeb/z/testdata/configs/integration/itest_s5/client_timeout.ini
-../it_script_files/itest_s5/genconn.ini /epoc32/release/wins/udeb/z/testdata/configs/integration/itest_s5/genconn.ini
-../it_script_files/itest_s5/itest.ini /epoc32/release/wins/udeb/z/testdata/configs/integration/itest_s5/itest.ini
-../it_script_files/itest_s5/rnif_timeout.ini /epoc32/release/wins/udeb/z/testdata/configs/integration/itest_s5/rnif_timeout.ini
-../it_script_files/itest_s5/route_timeout.ini /epoc32/release/wins/udeb/z/testdata/configs/integration/itest_s5/route_timeout.ini
-../it_script_files/itest_s5/load_ircsd_wlan.script /epoc32/release/wins/udeb/z/testdata/scripts/integration/itest_s5/load_ircsd_wlan.script
-../it_script_files/itest_s5/te_teststeps.ini /epoc32/release/wins/udeb/z/testdata/configs/integration/itest_s5/te_teststeps.ini
-#else
-../it_script_files/itest_s5.script /epoc32/release/wins/udeb/z/testdata/scripts/integration/itest_s5.script
-../it_script_files/itest_s5_manual_tcs.script /epoc32/release/wins/udeb/z/testdata/scripts/integration/itest_s5_manual_tcs.script
../it_script_files/itest_s5/itest5_01.script /epoc32/release/wins/udeb/z/testdata/scripts/integration/itest_s5/itest5_01.script
../it_script_files/itest_s5/itest5_02.script /epoc32/release/wins/udeb/z/testdata/scripts/integration/itest_s5/itest5_02.script
../it_script_files/itest_s5/itest5_03.script /epoc32/release/wins/udeb/z/testdata/scripts/integration/itest_s5/itest5_03.script
@@ -436,7 +295,7 @@
../it_script_files/itest_s5/load_ircsd.script /epoc32/release/wins/udeb/z/testdata/scripts/integration/itest_s5/load_ircsd.script
../it_script_files/itest_s5/csd-ir.xml /epoc32/release/wins/udeb/z/testdata/configs/integration/itest_s5/csd-ir.xml
../it_script_files/itest_s5/te_teststeps.ini /epoc32/release/wins/udeb/z/testdata/configs/integration/itest_s5/te_teststeps.ini
-#endif
+
../it_script_files/itest_s5.script /epoc32/release/winscw/udeb/z/testdata/scripts/integration/itest_s5.script