--- a/appinstaller/AppMngr2/Sisx/src/appmngr2sisxappinfo.cpp Fri Mar 12 15:43:14 2010 +0200
+++ b/appinstaller/AppMngr2/Sisx/src/appmngr2sisxappinfo.cpp Mon Mar 15 12:41:05 2010 +0200
@@ -324,7 +324,6 @@
EAppMngr2StatusInstalled );
CleanupStack::PushL( iterator );
- SwiUI::CommonUI::CCUIDetailsDialog* details = SwiUI::CommonUI::CCUIDetailsDialog::NewL();
FLOG( "CAppMngr2SisxAppInfo::ShowDetailsL, isDRM %d, noRightsObj %d, CertCount %d",
iIsDRMProtected, iIsRightsObjectMissingOrExpired, iCertificates.Count() );
@@ -341,6 +340,7 @@
}
}
+ SwiUI::CommonUI::CCUIDetailsDialog* details = SwiUI::CommonUI::CCUIDetailsDialog::NewL();
if( iIsDRMProtected && !iIsRightsObjectMissingOrExpired && !fileOpenError )
{
if( iCertificates.Count() )
@@ -364,11 +364,10 @@
}
}
- if( !fileOpenError )
+ if( iIsDRMProtected && !iIsRightsObjectMissingOrExpired && !fileOpenError )
{
CleanupStack::PopAndDestroy( &fileHandle );
}
-
CleanupStack::PopAndDestroy( iterator );
}
--- a/appinstaller/AppMngr2/Widget/inc/appmngr2widgetappinfo.h Fri Mar 12 15:43:14 2010 +0200
+++ b/appinstaller/AppMngr2/Widget/inc/appmngr2widgetappinfo.h Mon Mar 15 12:41:05 2010 +0200
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2008 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2008-2010 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"
@@ -47,12 +47,13 @@
private: // new functions
void ShowDetailsL();
-
+
private: // data
TUid iWidgetUid;
HBufC* iName;
HBufC* iDetails;
SwiUI::RSWInstLauncher* iSWInstLauncher;
+ HBufC8* iMimeType;
};
#endif // C_APPMNGR2WIDGETAPPINFO_H
--- a/appinstaller/AppMngr2/Widget/inc/appmngr2widgetruntime.h Fri Mar 12 15:43:14 2010 +0200
+++ b/appinstaller/AppMngr2/Widget/inc/appmngr2widgetruntime.h Mon Mar 15 12:41:05 2010 +0200
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2008 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2008-2010 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"
@@ -20,7 +20,7 @@
#define C_APPMNGR2WIDGETRUNTIME_H
#include <appmngr2runtime.h> // CAppMngr2Runtime
-#include <widgetregistryclient.h> // RWidgetRegistryClientSession
+#include <widgetregistryclient.h> // RWidgetRegistryClientSession
class CAppMngr2PackageInfo;
class CAknIconArray;
@@ -28,7 +28,8 @@
const TInt KAppMngr2WidgetUidValue = 0x20016BFA;
const TUid KAppMngr2WidgetUid = { KAppMngr2WidgetUidValue };
-_LIT8( KDataTypeWidget, "application/x-nokia-widget" );
+_LIT8( KDataTypeWgzWidget, "application/x-nokia-widget" );
+_LIT8( KDataTypeWgtWidget, "application/widget" );
class CAppMngr2WidgetRuntime : public CAppMngr2Runtime
@@ -37,7 +38,7 @@
static CAppMngr2WidgetRuntime* NewL( MAppMngr2RuntimeObserver& aObserver );
~CAppMngr2WidgetRuntime();
-public: // new CAppMngr2Runtime
+public: // from CAppMngr2Runtime
void LoadIconsL( CAknIconArray& aIconArray );
void GetSupportedDataTypesL( CDataTypeArray& aDataTypeArray );
void GetInstallationFilesL( RPointerArray<CAppMngr2PackageInfo>& aPackageInfos,
@@ -48,6 +49,9 @@
RFs& aFsSession, TRequestStatus& aStatus );
void CancelGetInstalledApps();
+public: // new functions
+ HBufC8* GetMimeTypeL( const TUid& aWidgetUid );
+
private: // new functions
CAppMngr2WidgetRuntime( MAppMngr2RuntimeObserver& aObserver );
void ConstructL();
--- a/appinstaller/AppMngr2/Widget/src/appmngr2widgetappinfo.cpp Fri Mar 12 15:43:14 2010 +0200
+++ b/appinstaller/AppMngr2/Widget/src/appmngr2widgetappinfo.cpp Mon Mar 15 12:41:05 2010 +0200
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2008 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2008-2010 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,6 +49,7 @@
CancelCommand();
delete iName;
delete iDetails;
+ delete iMimeType;
}
// ---------------------------------------------------------------------------
@@ -116,7 +117,7 @@
CleanupStack::Pop( swInstLauncher );
iSWInstLauncher = swInstLauncher;
}
- iSWInstLauncher->Uninstall( aStatus, iWidgetUid, KDataTypeWidget );
+ iSWInstLauncher->Uninstall( aStatus, iWidgetUid, *iMimeType );
return; // async operation started
default:
@@ -177,13 +178,16 @@
void CAppMngr2WidgetAppInfo::ConstructL( const CWidgetInfo& aWidget )
{
CAppMngr2AppInfo::ConstructL();
-
+
iWidgetUid = aWidget.iUid;
iName = aWidget.iBundleName->AllocL();
iDetails = SizeStringWithUnitsL( aWidget.iFileSize );
iLocationDrive = TDriveUnit( *aWidget.iDriveName );
iLocation = TAppMngr2DriveUtils::LocationFromDriveL( iLocationDrive, iFs );
+
+ CAppMngr2WidgetRuntime& runtime( static_cast<CAppMngr2WidgetRuntime&>( Runtime() ) );
+ iMimeType = runtime.GetMimeTypeL( iWidgetUid );
}
// ---------------------------------------------------------------------------
--- a/appinstaller/AppMngr2/Widget/src/appmngr2widgetruntime.cpp Fri Mar 12 15:43:14 2010 +0200
+++ b/appinstaller/AppMngr2/Widget/src/appmngr2widgetruntime.cpp Mon Mar 15 12:41:05 2010 +0200
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2008 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2008-2010 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"
@@ -64,7 +64,7 @@
{
MAknsSkinInstance* skinInstance = AknsUtils::SkinInstance();
HBufC* iconFilePath = NULL;
-
+
iconFilePath = FullBitmapFileNameLC( KAppMngr2WidgetIconFileNameMif );
// Icon 0: Widget application icon, qgn_menu_am_widget
@@ -86,8 +86,10 @@
void CAppMngr2WidgetRuntime::GetSupportedDataTypesL(
CDataTypeArray& aDataTypeArray )
{
- TDataType zipFile( KDataTypeWidget );
- aDataTypeArray.AppendL( zipFile );
+ TDataType wgzWidget( KDataTypeWgzWidget );
+ aDataTypeArray.AppendL( wgzWidget );
+ TDataType wgtWidget( KDataTypeWgtWidget );
+ aDataTypeArray.AppendL( wgtWidget );
}
// ---------------------------------------------------------------------------
@@ -145,14 +147,14 @@
*( widgetInfoArray[ index ] ), aFsSession ) );
if( err == KErrNone )
{
- CleanupStack::PushL( appObj );
+ CleanupStack::PushL( appObj );
aApps.Append( appObj );
CleanupStack::Pop( appObj );
}
}
-
+
CleanupStack::PopAndDestroy( &widgetInfoArray );
-
+
TRequestStatus* status = &aStatus;
User::RequestComplete( status, KErrNone );
}
@@ -166,11 +168,30 @@
}
// ---------------------------------------------------------------------------
+// CAppMngr2WidgetRuntime::GetMimeTypeL()
+// ---------------------------------------------------------------------------
+//
+HBufC8* CAppMngr2WidgetRuntime::GetMimeTypeL( const TUid& aWidgetUid )
+ {
+ CWidgetPropertyValue* prop = iWidgetRegistry.GetWidgetPropertyValueL( aWidgetUid, EMimeType );
+ CleanupStack::PushL( prop );
+
+ const TPtrC valuePtr( *prop );
+ HBufC8* retStr = HBufC8::NewLC( valuePtr.Length() );
+ TPtr8 retPtr( retStr->Des() );
+ retPtr.Copy( valuePtr );
+ CleanupStack::Pop( retStr );
+
+ CleanupStack::PopAndDestroy( prop );
+ return retStr;
+ }
+
+// ---------------------------------------------------------------------------
// CAppMngr2WidgetRuntime::CAppMngr2WidgetRuntime()
// ---------------------------------------------------------------------------
//
CAppMngr2WidgetRuntime::CAppMngr2WidgetRuntime( MAppMngr2RuntimeObserver& aObserver )
- : CAppMngr2Runtime( aObserver )
+ : CAppMngr2Runtime( aObserver )
{
}
--- a/appinstaller/AppMngr2/group/appmngr2.mmp Fri Mar 12 15:43:14 2010 +0200
+++ b/appinstaller/AppMngr2/group/appmngr2.mmp Mon Mar 15 12:41:05 2010 +0200
@@ -52,6 +52,7 @@
SOURCE appmngr2logpopuplist.cpp
SOURCE appmngr2logdatabase.cpp
SOURCE appmngr2logdatabaseentry.cpp
+SOURCE appmngr2exittimer.cpp
START RESOURCE ../data/appmngr2.rss
HEADER
--- a/appinstaller/AppMngr2/inc/appmngr2appui.h Fri Mar 12 15:43:14 2010 +0200
+++ b/appinstaller/AppMngr2/inc/appmngr2appui.h Mon Mar 15 12:41:05 2010 +0200
@@ -24,6 +24,7 @@
class CAppMngr2Model;
class CIdle;
+class CAppMngr2ExitTimer;
class CAppMngr2AppUi : public CAknViewAppUi, public MAppMngr2ModelObserver
@@ -58,6 +59,7 @@
EAllDone
} iDelayedConstructionStep;
TBool iConstructInstallationFilesFirst;
+ CAppMngr2ExitTimer* iExitTimer;
};
#endif // C_APPMNGR2APPUI_H
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/appinstaller/AppMngr2/inc/appmngr2exittimer.h Mon Mar 15 12:41:05 2010 +0200
@@ -0,0 +1,80 @@
+/*
+* Copyright (c) 2010 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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: Declares UI class for application
+*
+*/
+
+#ifndef C_APPMNGR2EXITTIMER_H
+#define C_APPMNGR2EXITTIMER_H
+
+#include <e32base.h>
+
+class CAppMngr2AppUi;
+
+class CAppMngr2ExitTimer : public CTimer
+ {
+ public: // Constructors and destructor
+
+ /**
+ * Two-phased constructor.
+ */
+ IMPORT_C static CAppMngr2ExitTimer* NewL( CAppMngr2AppUi* aAppUi );
+
+ /**
+ * Destructor.
+ */
+ IMPORT_C virtual ~CAppMngr2ExitTimer();
+
+ public: // New functions
+
+ /**
+ * Starts timer for Exit process.
+ * @since 9.2
+ */
+ IMPORT_C void StartExitTimer();
+
+ protected: // Functions from base classes
+
+ /**
+ * From CPeriodic, Called when timer has triggered.
+ * Calls Exit for the AppMngr.
+ * @since 9.2
+ */
+ void RunL();
+
+ /**
+ * From CActive, Handles a leave occurring in the request
+ * completion event handler RunL().
+ * @since 9.2
+ */
+ TInt RunError( TInt aError );
+
+ private:
+
+ /**
+ * C++ default constructor.
+ */
+ CAppMngr2ExitTimer( CAppMngr2AppUi* aAppUi );
+
+ /**
+ * 2nd phase constructor.
+ */
+ void ConstructL();
+
+ private:
+
+ CAppMngr2AppUi* iAppUi;
+ };
+
+#endif /* APPMNGR2EXITTIMER_H_ */
--- a/appinstaller/AppMngr2/inc/appmngr2model.h Fri Mar 12 15:43:14 2010 +0200
+++ b/appinstaller/AppMngr2/inc/appmngr2model.h Mon Mar 15 12:41:05 2010 +0200
@@ -60,6 +60,7 @@
void HandleCommandL( CAppMngr2InfoBase& aInfo, TInt aCommand );
void StartFetchingInstallationFilesL();
void StartFetchingInstalledAppsL();
+ TBool IsUninstall();
protected: // from CActive
void DoCancel();
--- a/appinstaller/AppMngr2/src/appmngr2appui.cpp Fri Mar 12 15:43:14 2010 +0200
+++ b/appinstaller/AppMngr2/src/appmngr2appui.cpp Mon Mar 15 12:41:05 2010 +0200
@@ -22,6 +22,8 @@
#include "appmngr2installedview.h" // CAppMngr2InstalledView
#include "appmngr2packagesview.h" // CAppMngr2PackagesView
#include "appmngr2.hrh" // Command IDs
+#include "appmngr2exittimer.h" // Exit Timer
+
#include <appmngr2runtime.h> // CAppMngr2Runtime
#include <appmngr2driveutils.h> // TAppMngr2DriveUtils
#include <appmngr2debugutils.h> // FLOG macros
@@ -96,6 +98,9 @@
FLOG( "CAppMngr2AppUi::ConstructL, starting delayed construct" );
iIdle = CIdle::NewL( CActive::EPriorityStandard );
iIdle->Start( TCallBack( &CAppMngr2AppUi::DelayedConstructL, this ) );
+
+ FLOG( "CAppMngr2AppUi::ConstructL, iExitTimer = NULL" );
+ iExitTimer = NULL;
}
// ---------------------------------------------------------------------------
@@ -111,7 +116,8 @@
{
iEikonEnv->DeleteResourceFile( iResourceFileOffset );
}
- FeatureManager::UnInitializeLib();
+ FeatureManager::UnInitializeLib();
+ delete iExitTimer;
}
// ---------------------------------------------------------------------------
@@ -208,6 +214,28 @@
switch ( aCommand )
{
case EEikCmdExit:
+ if ( iModel->IsUninstall() && iModel->IsActive() )
+ {
+ // In case we have uninstall process ongoing we need to
+ // start delay timer for Exit. This is because in some cases
+ // like VPN plug-in the GS is closed and app.mngr exit may come
+ // just when SWInstLauncer is completing req. in RunL (long
+ // running task). CActive do not return from Cancel and
+ // AppMngr2Model's destructor jams.
+ if ( !iExitTimer )
+ {
+ // If there is not exit timer already let's make one.
+ iExitTimer = CAppMngr2ExitTimer::NewL( this );
+ iExitTimer->StartExitTimer();
+ }
+ }
+ else
+ {
+ // if we do not have uninstall request let's do Exit now.
+ Exit();
+ }
+ break;
+
case EAknCmdExit:
case EAknSoftkeyExit:
Exit();
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/appinstaller/AppMngr2/src/appmngr2exittimer.cpp Mon Mar 15 12:41:05 2010 +0200
@@ -0,0 +1,122 @@
+/*
+*
+* Copyright (c) 2010 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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: This file contains the implementation of CAppMngr2ExitTimer
+* class member functions.
+*
+*/
+
+
+// INCLUDE FILES
+
+#include <appmngr2runtime.h> // FLOG macros
+#include <appmngr2debugutils.h> // FLOG macros
+#include "appmngr2exittimer.h"
+#include "appmngr2appui.h" // CAppMngr2AppUi
+
+const TInt KAppMngr2ExitDelayInterval = 1000000; // 1,0 sec
+
+// ============================ MEMBER FUNCTIONS ===============================
+
+// -----------------------------------------------------------------------------
+// CAppMngr2ExitTimer::CAppMngr2ExitTimer
+// C++ default constructor can NOT contain any code, that might leave.
+// -----------------------------------------------------------------------------
+//
+CAppMngr2ExitTimer::CAppMngr2ExitTimer( CAppMngr2AppUi* aAppUi )
+ : CTimer( CActive::EPriorityHigh ),
+ iAppUi( aAppUi )
+ {
+ FLOG( "CAppMngr2ExitTimer::CAppMngr2ExitTimer" );
+ CActiveScheduler::Add( this );
+ }
+
+// -----------------------------------------------------------------------------
+// CAppMngr2ExitTimer::ConstructL
+// Symbian 2nd phase constructor can leave.
+// -----------------------------------------------------------------------------
+//
+void CAppMngr2ExitTimer::ConstructL()
+ {
+ CTimer::ConstructL();
+ }
+
+// -----------------------------------------------------------------------------
+// CAppMngr2ExitTimer::NewL
+// Two-phased constructor.
+// -----------------------------------------------------------------------------
+//
+EXPORT_C CAppMngr2ExitTimer* CAppMngr2ExitTimer::NewL( CAppMngr2AppUi* aAppUi )
+ {
+ CAppMngr2ExitTimer* self = new( ELeave ) CAppMngr2ExitTimer( aAppUi );
+ CleanupStack::PushL( self );
+ self->ConstructL();
+ CleanupStack::Pop( self );
+ return self;
+ }
+
+// -----------------------------------------------------------------------------
+// CAppMngr2ExitTimer::Destructor
+//
+// -----------------------------------------------------------------------------
+//
+EXPORT_C CAppMngr2ExitTimer::~CAppMngr2ExitTimer()
+ {
+ FLOG( "CAppMngr2ExitTimer::~CAppMngr2ExitTimer" );
+ CTimer::Cancel();
+ }
+
+// -----------------------------------------------------------------------------
+// CAppMngr2ExitTimer::StartExitTimer
+//
+// -----------------------------------------------------------------------------
+//
+EXPORT_C void CAppMngr2ExitTimer::StartExitTimer()
+ {
+ FLOG( "CAppMngr2ExitTimer::StartExitTimer" );
+ FLOG( "CAppMngr2ExitTimer After = %d", KAppMngr2ExitDelayInterval );
+ TTimeIntervalMicroSeconds32 timeout( KAppMngr2ExitDelayInterval );
+ After( timeout );
+ FLOG( "CAppMngr2ExitTimer::StartExitTimer END" );
+ }
+
+// -----------------------------------------------------------------------------
+// CAppMngr2ExitTimer::RunL
+//
+// -----------------------------------------------------------------------------
+//
+void CAppMngr2ExitTimer::RunL()
+ {
+ FLOG( "CAppMngr2ExitTimer::RunL START" );
+ // Exit will leave but this is handled in RunError function.
+ FLOG( "CAppMngr2ExitTimer::RunL: iAppUi->Exit()" );
+ iAppUi->Exit();
+ FLOG( "CAppMngr2ExitTimer::RunL END" );
+ }
+
+// -----------------------------------------------------------------------------
+// CAppMngr2ExitTimer::RunError
+//
+// -----------------------------------------------------------------------------
+//
+TInt CAppMngr2ExitTimer::RunError( TInt aError )
+ {
+ // RunL will leave with the error -1003 KLeaveExit and RunError
+ // needs to return this error to CActiveScheduler which will then
+ // make exit leave in CBaActiveScheduler::Error function.
+ FLOG( "CAppMngr2ExitTimer::RunError error = %d", aError );
+ return aError;
+ }
+
+// End of File
--- a/appinstaller/AppMngr2/src/appmngr2model.cpp Fri Mar 12 15:43:14 2010 +0200
+++ b/appinstaller/AppMngr2/src/appmngr2model.cpp Mon Mar 15 12:41:05 2010 +0200
@@ -291,6 +291,21 @@
}
// ---------------------------------------------------------------------------
+// CAppMngr2Model::IsUninstall()
+// ---------------------------------------------------------------------------
+//
+TBool CAppMngr2Model::IsUninstall()
+ {
+ if ( iActiveCommand == EAppMngr2CmdUninstall )
+ {
+ FLOG( "CAppMngr2Model::IsUninstall: ETrue" );
+ return ETrue;
+ }
+ FLOG( "CAppMngr2Model::IsUninstall: EFalse" );
+ return EFalse;
+ }
+
+// ---------------------------------------------------------------------------
// CAppMngr2Model::DoCancel()
// ---------------------------------------------------------------------------
//
--- a/iaupdateapi_stub/group/bld.inf Fri Mar 12 15:43:14 2010 +0200
+++ b/iaupdateapi_stub/group/bld.inf Mon Mar 15 12:41:05 2010 +0200
@@ -28,7 +28,7 @@
../rom/iaupdateapi.iby CORE_MW_LAYER_IBY_EXPORT_PATH( iaupdateapi.iby )
-../sis/iaupdate_stub.sis /epoc32/data/z/system/install/stub_iaupdate_stub.sis
+../sis/iaupdate_stub.SIS /epoc32/data/z/system/install/stub_iaupdate_stub.sis
PRJ_MMPFILES
iaupdateapi.mmp
--- a/installationservices/swi/bwins/SecurityManager_v2U.DEF Fri Mar 12 15:43:14 2010 +0200
+++ b/installationservices/swi/bwins/SecurityManager_v2U.DEF Mon Mar 15 12:41:05 2010 +0200
@@ -65,4 +65,6 @@
?MaxNumOfLogEntries@CSecurityPolicy@Swi@@QBEHXZ @ 64 NONAME ; int Swi::CSecurityPolicy::MaxNumOfLogEntries(void) const
?VerifyControllerL@CSecurityManager@Swi@@QAEXAAVTDesC8@@ABVCController@Sis@2@PAW4TSignatureValidationResult@2@AAV?$RPointerArray@VCPKIXValidationResultBase@@@@AAV?$RPointerArray@VCX509Certificate@@@@PAVTCapabilitySet@@AAH6AAVTRequestStatus@@H@Z @ 65 NONAME ; void Swi::CSecurityManager::VerifyControllerL(class TDesC8 &, class Swi::Sis::CController const &, enum Swi::TSignatureValidationResult *, class RPointerArray<class CPKIXValidationResultBase> &, class RPointerArray<class CX509Certificate> &, class TCapabilitySet *, int &, int &, class TRequestStatus &, int)
?AllowOverwriteOnRestore@CSecurityPolicy@Swi@@QBEHXZ @ 66 NONAME ; int Swi::CSecurityPolicy::AllowOverwriteOnRestore(void) const
+ ?IsPackageUidPresent@SecUtils@Swi@@SAHVTUid@@AAY0BA@V3@@Z @ 67 NONAME ; int Swi::SecUtils::IsPackageUidPresent(class TUid, class TUid [16] &)
+ ?PublishPackageUid@SecUtils@Swi@@SAHVTUid@@AAY0BA@V3@@Z @ 68 NONAME ; int Swi::SecUtils::PublishPackageUid(class TUid, class TUid [16] &)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/installationservices/swi/bwins/swiutilsu.def Mon Mar 15 12:41:05 2010 +0200
@@ -0,0 +1,3 @@
+EXPORTS
+ ?GetAllUids@Swi@@YAHAAV?$RArray@VTUid@@@@@Z @ 1 NONAME ; int Swi::GetAllUids(class RArray<class TUid> &)
+
--- a/installationservices/swi/eabi/SecurityManager_v2U.DEF Fri Mar 12 15:43:14 2010 +0200
+++ b/installationservices/swi/eabi/SecurityManager_v2U.DEF Mon Mar 15 12:41:05 2010 +0200
@@ -82,4 +82,6 @@
_ZNK3Swi15CSecurityPolicy18MaxNumOfLogEntriesEv @ 81 NONAME
_ZN3Swi16CSecurityManager17VerifyControllerLER6TDesC8RKNS_3Sis11CControllerEPNS_26TSignatureValidationResultER13RPointerArrayI25CPKIXValidationResultBaseERS9_I16CX509CertificateEP14TCapabilitySetRiSI_R14TRequestStatusi @ 82 NONAME
_ZNK3Swi15CSecurityPolicy23AllowOverwriteOnRestoreEv @ 83 NONAME
+ _ZN3Swi8SecUtils17PublishPackageUidE4TUidRA16_S1_ @ 84 NONAME
+ _ZN3Swi8SecUtils19IsPackageUidPresentE4TUidRA16_KS1_ @ 85 NONAME
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/installationservices/swi/eabi/swiutilsu.def Mon Mar 15 12:41:05 2010 +0200
@@ -0,0 +1,3 @@
+EXPORTS
+ _ZN3Swi10GetAllUidsER6RArrayI4TUidE @ 1 NONAME
+
--- a/installationservices/swi/group/bld.inf Fri Mar 12 15:43:14 2010 +0200
+++ b/installationservices/swi/group/bld.inf Mon Mar 15 12:41:05 2010 +0200
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 1999-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 1999-2010 Nokia Corporation and/or its subsidiary(-ies).
* All rights reserved.
* This component and the accompanying materials are made available
* under the terms of the License "Eclipse Public License v1.0"
@@ -57,6 +57,7 @@
../inc/swi/sistruststatus.h SYMBIAN_MW_LAYER_PLATFORM_EXPORT_PATH(swi/sistruststatus.h)
../inc/swi/sisregistrylog.h SYMBIAN_MW_LAYER_PLATFORM_EXPORT_PATH(swi/sisregistrylog.h)
../inc/swi/installtypes.h SYMBIAN_MW_LAYER_PLATFORM_EXPORT_PATH(swi/installtypes.h)
+../source/swiutils/swiutils.h SYMBIAN_MW_LAYER_PLATFORM_EXPORT_PATH(swi/swiutils.h)
// ROMKIT include
../inc/swi.iby /epoc32/rom/include/swi.iby
@@ -124,6 +125,7 @@
sishelper_tshell.mmp
sislauncherserver_tshell.mmp
#endif
+swiutils.mmp
#endif
#endif
@@ -366,7 +368,6 @@
../test/tsisregistrytest_legacy/Scripts/integritychecktest.ini /epoc32/winscw/c/tswi/tsisregistrytest/scripts/integritychecktest.ini
../test/tsisregistrytest_legacy/Scripts/integritychecktest5Install_winscw.script /epoc32/winscw/c/tswi/tsisregistrytest/scripts/integritychecktest5install_winscw.script
../test/tsisregistrytest_legacy/Scripts/integritychecktest5verify_winscw.script /epoc32/winscw/c/tswi/tsisregistrytest/scripts/integritychecktest5verify_winscw.script
-../test/writableswicertstore/certs/some_swicertstore.dat /epoc32/winscw/c/tswi/certstore/some_swicertstore.dat
../test/tsisregistrytest_legacy/data/backup.lst /epoc32/winscw/c/tswi/tsisregistrytest/data/backup.lst
../test/tsisregistrytest_legacy/data/hashForLang_txt.dat /epoc32/winscw/c/tswi/tsisregistrytest/data/hashforlang_txt.dat
@@ -1035,4 +1036,5 @@
../test/tuiscriptadaptors/scripts/testpreinstalled_sucert_edrive.sis /epoc32/winscw/c/tswi/tuiscriptadaptors/scripts/testpreinstalled_sucert_edrive.sis
../test/tuiscriptadaptors/scripts/testpreinstalled_sucert_edrive.pkg /epoc32/winscw/c/tswi/tuiscriptadaptors/scripts/testpreinstalled_sucert_edrive.pkg
../test/tuiscriptadaptors/scripts/testnoaiacert.sis /epoc32/winscw/c/tswi/tuiscriptadaptors/scripts/testnoaiacert.sis
+../test/writableswicertstore/certs/some_swicertstore.dat /epoc32/winscw/c/tswi/certstore/some_swicertstore.dat
// End of file
--- a/installationservices/swi/group/sisregistryserver.mmp Fri Mar 12 15:43:14 2010 +0200
+++ b/installationservices/swi/group/sisregistryserver.mmp Mon Mar 15 12:41:05 2010 +0200
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2004-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2004-2010 Nokia Corporation and/or its subsidiary(-ies).
* All rights reserved.
* This component and the accompanying materials are made available
* under the terms of the License "Eclipse Public License v1.0"
@@ -28,6 +28,8 @@
// minimum 4KB maximum 2MB (twice the maximum default)
EPOCHEAPSIZE 0x1000 0x200000
+epocprocesspriority low
+
target sisregistryserver.exe
targettype exe
--- a/installationservices/swi/group/sisregistryserver_legacy.mmp Fri Mar 12 15:43:14 2010 +0200
+++ b/installationservices/swi/group/sisregistryserver_legacy.mmp Mon Mar 15 12:41:05 2010 +0200
@@ -29,6 +29,8 @@
// minimum 4KB maximum 2MB (twice the maximum default)
EPOCHEAPSIZE 0x1000 0x200000
+epocprocesspriority low
+
target sisregistryserver.exe
targettype exe
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/installationservices/swi/group/swiutils.mmp Mon Mar 15 12:41:05 2010 +0200
@@ -0,0 +1,39 @@
+/*
+* Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of the License "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+* swiutils.mmp
+*
+*/
+
+
+/**
+ @file
+ swiutils
+*/
+
+target swiutils.dll
+CAPABILITY All -Tcb
+targettype DLL
+UID 0x1000008D 0x2002D4F3
+VENDORID 0x70000001
+
+USERINCLUDE ../inc
+USERINCLUDE ../inc/swi
+MW_LAYER_SYSTEMINCLUDE_SYMBIAN
+
+SOURCEPATH ../source/swiutils
+SOURCE swiutils.cpp
+
+LIBRARY euser.lib
+SMPSAFE
\ No newline at end of file
--- a/installationservices/swi/inc/secutils.h Fri Mar 12 15:43:14 2010 +0200
+++ b/installationservices/swi/inc/secutils.h Mon Mar 15 12:41:05 2010 +0200
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2004-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2004-2010 Nokia Corporation and/or its subsidiary(-ies).
* All rights reserved.
* This component and the accompanying materials are made available
* under the terms of the License "Eclipse Public License v1.0"
@@ -23,13 +23,16 @@
@internalTechnology
*/
+#ifndef __SECUTILS_H__
+#define __SECUTILS_H__
+
#include <e32std.h>
#include <f32file.h>
#include <e32uid.h>
+#include "swi/swiutils.h"
namespace Swi
{
-
/**
* Static class containing Security Manager's utility functions
* @released
@@ -83,6 +86,20 @@
* caller.
*/
IMPORT_C static HBufC* HexHashL(const TDesC& aName);
+
+ /**
+ * Appends a Uid to the buffer and publishes the same.
+ * @param aBuf The buffer containing the list of Uids that is published.
+ * @param aUid The UID of the package which has been processed.
+ */
+ IMPORT_C static TInt PublishPackageUid(TUid aUid, TUid (&aUidList)[KMaxUidCount]);
+
+ /**
+ * Checks if the given Uid is present in the buffer that contains the list of Uids published.
+ * @param aBuf The buffer containing the list of Uids that is published.
+ * @param aUid The UID of the package which to be verified.
+ */
+ IMPORT_C static TBool IsPackageUidPresent(TUid aUid, const TUid (&aUidList)[KMaxUidCount]);
};
inline TBool SecUtils::IsExe(const TEntry& aEntry)
@@ -95,3 +112,5 @@
return (aEntry[0].iUid == KDynamicLibraryUidValue) ? ETrue : EFalse;
}
} // namespace Swi
+
+#endif
--- a/installationservices/swi/inc/swi.iby Fri Mar 12 15:43:14 2010 +0200
+++ b/installationservices/swi/inc/swi.iby Mon Mar 15 12:41:05 2010 +0200
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2009-2010 Nokia Corporation and/or its subsidiary(-ies).
* All rights reserved.
* This component and the accompanying materials are made available
* under the terms of the License "Eclipse Public License v1.0"
@@ -54,6 +54,7 @@
file=ABI_DIR\BUILD_DIR\cafdataprovider.dll sys\bin\cafdataprovider.dll
file=ABI_DIR\BUILD_DIR\pkgremover.dll sys\bin\pkgremover.dll
file=ABI_DIR\BUILD_DIR\swiobserver.exe sys\bin\swiobserver.exe
+file=ABI_DIR\BUILD_DIR\swiutils.dll sys\bin\swiutils.dll
#include "swiplugin.iby"
--- a/installationservices/swi/inc/swi/swispubsubdefs.h Fri Mar 12 15:43:14 2010 +0200
+++ b/installationservices/swi/inc/swi/swispubsubdefs.h Mon Mar 15 12:41:05 2010 +0200
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2004-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2004-2010 Nokia Corporation and/or its subsidiary(-ies).
* All rights reserved.
* This component and the accompanying materials are made available
* under the terms of the License "Eclipse Public License v1.0"
--- a/installationservices/swi/inc/switextshell.iby Fri Mar 12 15:43:14 2010 +0200
+++ b/installationservices/swi/inc/switextshell.iby Mon Mar 15 12:41:05 2010 +0200
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2008-2010 Nokia Corporation and/or its subsidiary(-ies).
* All rights reserved.
* This component and the accompanying materials are made available
* under the terms of the License "Eclipse Public License v1.0"
@@ -94,6 +94,7 @@
file=ABI_DIR\BUILD_DIR\backuprestore.dll sys\bin\backuprestore.dll
file=ABI_DIR\BUILD_DIR\cafdataprovider.dll sys\bin\cafdataprovider.dll
file=ABI_DIR\BUILD_DIR\pkgremover.dll sys\bin\pkgremover.dll
+file=ABI_DIR\BUILD_DIR\swiutils.dll sys\bin\swiutils.dll
// Core SWI - 9.5
REM Including swiplugin.iby instead explicitly mentioning the files to avoid duplicate includes
--- a/installationservices/swi/source/backuprestore/backupsession.cpp Fri Mar 12 15:43:14 2010 +0200
+++ b/installationservices/swi/source/backuprestore/backupsession.cpp Mon Mar 15 12:41:05 2010 +0200
@@ -42,6 +42,11 @@
DEBUG_PRINTF(_L8("RBackupSession::Close"));
iSession.Close();
}
+
+ // Format for metadata ( Ensure that nothing is added in between to maintain compatability) :
+ // Drive ( for Base SA ) + No of Controllers ( SA + PU + SP ) + Controllers for SA and PU +
+ // Controllers for Augmentation + File Count + File Names Array ( for SA,PU and SP ) +
+ // Augmentation Drives + Matching Supported Languages ( for SA and SP with ELANGNONE as separator )
EXPORT_C HBufC8* RBackupSession::GetMetaDataL(TUid aPackageUid, RPointerArray<HBufC>& aFilesArray)
{
@@ -72,70 +77,127 @@
CleanupResetAndDestroyPushL(packages);
entry.AugmentationsL(packages);
+ TInt augmentationCount(packages.Count());
+ TInt augCount = augmentationCount;
+
RBufWriteStream stream(*tempBuffer);
CleanupClosePushL(stream);
- stream.WriteUint32L(drive);
-
- // backup the base package (except for PA and ROM stubs) plus partial upgrades and augmentations.
- entry.FilesL(aFilesArray);
-
+ stream.WriteUint32L(drive);
+
+ if (entry.RemovableL()) //Cannot Backup non-removable (NR) packages
+ {
+ // backup the base package (except for PA and ROM stubs) plus partial upgrades and augmentations.
+ entry.FilesL(aFilesArray);
- // Filter out any files on the Z drive
- TInt fileIndex = aFilesArray.Count() - 1;
- while (fileIndex >= 0)
- {
- TChar driveCh = (*aFilesArray[fileIndex])[0];
- if (driveCh == 'z' || driveCh == 'Z')
- {
- delete aFilesArray[fileIndex];
- aFilesArray.Remove(fileIndex);
- }
- --fileIndex;
- }
+ // Filter out any files on the Z drive
+ TInt fileIndex = aFilesArray.Count() - 1;
+ while (fileIndex >= 0)
+ {
+ TChar driveCh = (*aFilesArray[fileIndex])[0];
+ if (driveCh == 'z' || driveCh == 'Z')
+ {
+ delete aFilesArray[fileIndex];
+ aFilesArray.Remove(fileIndex);
+ }
+ --fileIndex;
+ }
- TInt controllersCount = controllers.Count();
- TInt firstController = 0;
- if (entry.PreInstalledL() || entry.IsInRomL())
- {
- firstController = 1; // Don't backup the controller for the ROM stub
- if (controllersCount <= 1)
- {
- DEBUG_PRINTF(_L8("Base package is pre-installed or in ROM and has not been upgraded"));
- stream.WriteInt32L(packages.Count());
- if (entry.IsInRomL())
+ TInt controllersCount = controllers.Count();
+ TInt firstController = 0;
+ if (entry.PreInstalledL() || entry.IsInRomL())
+ {
+ firstController = 1; // Don't backup the controller for the ROM stub
+ if (controllersCount <= 1)
+ {
+ DEBUG_PRINTF(_L8("Base package is pre-installed or in ROM and has not been upgraded"));
+ stream.WriteInt32L(packages.Count());
+ if (entry.IsInRomL())
+ {
+ matchingSupportedLanguagesArray.Close();
+ }
+ }
+ else
{
- matchingSupportedLanguagesArray.Close();
+ // Backup any PUs for the ROM stub.
+ DEBUG_PRINTF2(_L8("Found %d partial upgrades"), controllersCount - 1);
+ stream.WriteInt32L(controllersCount - 1 + packages.Count());
}
- }
- else
- {
- // Backup any PUs for the ROM stub.
- DEBUG_PRINTF2(_L8("Found %d partial upgrades"), controllersCount - 1);
- stream.WriteInt32L(controllersCount - 1 + packages.Count());
- }
+ }
+ else
+ {
+ // Standard SA package
+ DEBUG_PRINTF2(_L8("Found %d controllers"), controllersCount);
+ stream.WriteInt32L(controllers.Count() + packages.Count());
+ }
+
+ for (TInt i = firstController; i < controllersCount; ++i)
+ {
+ stream << *controllers[i];
+ }
+
}
else
- {
- // Standard SA package
- DEBUG_PRINTF2(_L8("Found %d controllers"), controllersCount);
- stream.WriteInt32L(controllers.Count() + packages.Count());
- }
-
- for (TInt i = firstController; i < controllersCount; ++i)
- {
- stream << *controllers[i];
- }
-
- TInt augmentationCount(packages.Count());
+ {
+ if(!augmentationCount)
+ {
+ DEBUG_PRINTF2(_L("RBackupSession::GetMetaDataL - Cannot Backup non-removable application; Uid: '0x%08x'"),aPackageUid.iUid);
+ CleanupStack::PopAndDestroy(6, &entry); // stream, controllers, matchingSupportedLanguagesArray, tempBuffer, packages, entry
+ User::Leave(KErrNotSupported); // cannot remove non-removable (NR) packages
+ }
+ else
+ {
+ for (TInt i = 0; i < augmentationCount; ++i)
+ {
+ RSisRegistryEntry augmentation;
+ augmentation.OpenL(iSession, *packages[i]);
+ CleanupClosePushL(augmentation);
+
+ if (!augmentation.RemovableL())
+ {
+ augCount--;
+ CleanupStack::PopAndDestroy(1, &augmentation);
+ continue;
+ }
+ CleanupStack::PopAndDestroy(1, &augmentation);
+ }
+ if(!augCount)
+ {
+ DEBUG_PRINTF2(_L("RBackupSession::GetMetaDataL - Cannot Backup non-removable augmentation; Uid: '0x%08x'"),aPackageUid.iUid);
+ CleanupStack::PopAndDestroy(6, &entry); // stream, controllers, matchingSupportedLanguagesArray, tempBuffer, packages, entry
+ User::Leave(KErrNotSupported); // cannot remove non-removable (NR) packages
+ }
+ else
+ {
+ stream.WriteInt32L(augCount); // Writing removable augmentations controller count
+ if (entry.IsInRomL())
+ {
+ matchingSupportedLanguagesArray.Close();
+ }
+ }
+ }
+ }
+
RArray<TChar> augmentationDrives;
CleanupClosePushL(augmentationDrives);
+ TBool nonRemovableAugmentation = ETrue;
+
for (TInt i = 0; i < augmentationCount; ++i)
{
RSisRegistryEntry augmentation;
augmentation.OpenL(iSession, *packages[i]);
CleanupClosePushL(augmentation);
+ if(augCount != augmentationCount)
+ {
+ if (!augmentation.RemovableL()) //if loops are not clubed to avoid augmentation.RemovableL() API Call
+ {
+ CleanupStack::PopAndDestroy(1, &augmentation);
+ continue;
+ }
+ }
+ nonRemovableAugmentation = EFalse;
+
augmentation.FilesL(aFilesArray);
RPointerArray<HBufC8> augmentationControllers;
@@ -159,6 +221,13 @@
CleanupStack::PopAndDestroy(2, &augmentation);
}
+ if(nonRemovableAugmentation && augmentationCount)
+ {
+ DEBUG_PRINTF2(_L("RBackupSession::GetMetaDataL - Cannot Backup non-removable Augmentation; Uid: '0x%08x'"),aPackageUid.iUid);
+ CleanupStack::PopAndDestroy(7, &entry); // augmentationDrives, stream, controllers, matchingSupportedLanguagesArray, tempBuffer, packages
+ User::Leave(KErrNotSupported); // cannot remove non-removable (NR) packages
+ }
+
// Write the number of files originally installed,
// and their names to the backup metadata
TInt filesCount(aFilesArray.Count());
@@ -172,7 +241,7 @@
// Add the selected drive for each augmentation in the same order as
// as the list of controllers. The augmentation controllers will
// be counted on restore to be sure to correct number of drives.
- for (TInt k = 0; k < augmentationCount; ++k)
+ for (TInt k = 0; k < augCount; ++k)
{
stream.WriteUint32L(augmentationDrives[k]);
}
@@ -193,5 +262,4 @@
return result;
}
-
}
--- a/installationservices/swi/source/securitymanager/secutils.cpp Fri Mar 12 15:43:14 2010 +0200
+++ b/installationservices/swi/source/securitymanager/secutils.cpp Mon Mar 15 12:41:05 2010 +0200
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2004-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2004-2010 Nokia Corporation and/or its subsidiary(-ies).
* All rights reserved.
* This component and the accompanying materials are made available
* under the terms of the License "Eclipse Public License v1.0"
@@ -18,6 +18,9 @@
#include "secutils.h"
#include <hash.h>
+#include <e32property.h>
+#include <sacls.h>
+#include "log.h"
namespace Swi
{
@@ -65,5 +68,39 @@
CleanupStack::PopAndDestroy(digester);
return hashBuf;
}
-
+
+EXPORT_C TInt SecUtils::PublishPackageUid(TUid aUid, TUid (&aUidList)[KMaxUidCount])
+ {
+ TInt i=0;
+ TInt count = aUidList[0].iUid;
+
+ if (count>=KMaxUidCount-1)
+ return KErrOverflow;
+
+ aUidList[++count] = aUid;
+ aUidList[0].iUid++;
+
+ TInt *tempUidList = (TInt*)aUidList;
+ TBuf<KMaxUidCount*sizeof(TUid)+1> buffer;
+ TInt *bufPtr = (TInt*)buffer.Ptr();
+ buffer.SetLength((count+1)*sizeof(TUid));
+ do
+ {
+ *bufPtr = *tempUidList;
+ }while(++i<=count && bufPtr++ && tempUidList++);
+
+ return(RProperty::Set(KUidSystemCategory, KSWIUidsCurrentlyBeingProcessed, buffer));
+ }
+
+EXPORT_C TBool SecUtils::IsPackageUidPresent(TUid aUid, const TUid (&aUidList)[KMaxUidCount])
+ {
+ TInt count = aUidList[0].iUid;
+ for(TInt i=1;i<=count;i++)
+ {
+ if(aUidList[i]==aUid)
+ return ETrue;
+ }
+ return EFalse;
+ }
+
} // namespace Swi
--- a/installationservices/swi/source/swis/server/installationplanner.cpp Fri Mar 12 15:43:14 2010 +0200
+++ b/installationservices/swi/source/swis/server/installationplanner.cpp Mon Mar 15 12:41:05 2010 +0200
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2004-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2004-2010 Nokia Corporation and/or its subsidiary(-ies).
* All rights reserved.
* This component and the accompanying materials are made available
* under the terms of the License "Eclipse Public License v1.0"
@@ -33,6 +33,7 @@
#include "siscontentprovider.h"
#include "sishelperclient.h"
#include "securitypolicy.h"
+#include "secutils.h"
#include <swi/msisuihandlers.h>
@@ -1068,6 +1069,30 @@
// Process the actual controller, then return the application
ProcessInstallBlockL(aController.InstallBlock(), *application, aFilesToCapabilityCheck, *filesList);
+ //Publishing the UID of the associated package.
+ TUid publishUid = aController.Info().Uid().Uid();
+ if(!(Swi::SecUtils::IsPackageUidPresent(publishUid, iUidList)))
+ {
+ TInt err = Swi::SecUtils::PublishPackageUid(publishUid, iUidList);
+ if(err == KErrNone)
+ {
+ DEBUG_PRINTF2(_L("CInstallationPlanner::ProcessControllerL published Uid %x."), publishUid.iUid);
+ }
+ else if(err == KErrOverflow)
+ {
+ DEBUG_PRINTF2(_L("CInstallationPlanner::ProcessControllerL failed to publish Uid %x as the array, holding the uids, exceeded its upper limit."),publishUid.iUid);
+ }
+ else if(err == KErrNotFound)
+ {
+ DEBUG_PRINTF2(_L("CInstallationPlanner::ProcessControllerL failed to publish Uid %x as the property is not been defined."),publishUid.iUid);
+ }
+ else
+ {
+ DEBUG_PRINTF3(_L("CInstallationPlanner::ProcessControllerL failed to publish Uid %x with error %d."),publishUid.iUid, err);
+ User::Leave(err);
+ }
+ }
+
//Append planned controllers list
iFilesFromPlannedControllers.AppendL(filesList);
CleanupStack::Pop(filesList);
--- a/installationservices/swi/source/swis/server/installationplanner.h Fri Mar 12 15:43:14 2010 +0200
+++ b/installationservices/swi/source/swis/server/installationplanner.h Mon Mar 15 12:41:05 2010 +0200
@@ -585,6 +585,7 @@
// Is the planning hapens just for component information collection?
TBool iIsInInfoCollectionMode;
#endif
+
};
} // namespace Swi
--- a/installationservices/swi/source/swis/server/planner.cpp Fri Mar 12 15:43:14 2010 +0200
+++ b/installationservices/swi/source/swis/server/planner.cpp Mon Mar 15 12:41:05 2010 +0200
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2004-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2004-2010 Nokia Corporation and/or its subsidiary(-ies).
* All rights reserved.
* This component and the accompanying materials are made available
* under the terms of the License "Eclipse Public License v1.0"
@@ -493,6 +493,27 @@
}
UpdateAppForUninstallL(*rootApplication, aRootNode);
+ if(!(Swi::SecUtils::IsPackageUidPresent(aRootNode.PackageL().Uid(), iUidList)))
+ {
+ TInt err = SecUtils::PublishPackageUid(aRootNode.PackageL().Uid(), iUidList);
+ if(err==KErrNone)
+ {
+ DEBUG_PRINTF2(_L("CPlanner::CreatePlannedApplicationL published Uid is %x."),aRootNode.PackageL().Uid());
+ }
+ else if(err == KErrOverflow)
+ {
+ DEBUG_PRINTF2(_L("CPlanner::CreatePlannedApplicationL failed to publish Uid %x as the array, holding the uids, exceeded its upper limit."),aRootNode.PackageL().Uid());
+ }
+ else if(err == KErrNotFound)
+ {
+ DEBUG_PRINTF2(_L("CPlanner::CreatePlannedApplicationL failed to publish Uid %x as the property is not defined."),aRootNode.PackageL().Uid());
+ }
+ else
+ {
+ DEBUG_PRINTF3(_L("CPlanner::CreatePlannedApplicationL failed to publish Uid %x with error."),aRootNode.PackageL().Uid(), err);
+ User::Leave(err);
+ }
+ }
CleanupStack::Pop(rootApplication);
return rootApplication;
--- a/installationservices/swi/source/swis/server/planner.h Fri Mar 12 15:43:14 2010 +0200
+++ b/installationservices/swi/source/swis/server/planner.h Mon Mar 15 12:41:05 2010 +0200
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2004-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2004-2010 Nokia Corporation and/or its subsidiary(-ies).
* All rights reserved.
* This component and the accompanying materials are made available
* under the terms of the License "Eclipse Public License v1.0"
@@ -34,6 +34,7 @@
#include "sisregistrywritableentry.h"
#include "sisregistrywritablesession.h"
#include "sisregistrypackage.h"
+#include "secutils.h"
namespace Swi
{
@@ -101,6 +102,9 @@
protected:
/// The drive on which to store device integrity data (hashes, registry etc)
TChar iSystemDriveChar;
+ /// To store package uids which are getting processed
+ /////An array whose first element holds the number of uids in the subsequent indices of the array, followed by the the list of uids that are being published.
+ TUid iUidList[KMaxUidCount];
private:
/// Handle to UISS
@@ -120,6 +124,7 @@
// Registry Session
RSisRegistryWritableSession iRegistrySession;
+
};
// inline functions from CPlanner
--- a/installationservices/swi/source/swis/server/processor.cpp Fri Mar 12 15:43:14 2010 +0200
+++ b/installationservices/swi/source/swis/server/processor.cpp Mon Mar 15 12:41:05 2010 +0200
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 1997-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 1997-2010 Nokia Corporation and/or its subsidiary(-ies).
* All rights reserved.
* This component and the accompanying materials are made available
* under the terms of the License "Eclipse Public License v1.0"
@@ -784,9 +784,23 @@
#endif
// Display error dialog and leave if the file cannot be removed,
// ignoring missing files, media cards not present or corrupt media
+
+ TInt noOfDetletionAttempts=1;
+ while ((err == KErrInUse ||err==KErrAccessDenied )&& noOfDetletionAttempts <= KMaxNoOfDeletionAttempts )
+ {
+#ifdef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK
+ TRAP(err, TransactionSession().RemoveL(fileToRemove));
+#else
+ TRAP(err, IntegrityServices().RemoveL(fileToRemove));
+#endif
+ DEBUG_PRINTF2(_L8("Deletion attempt %d"), noOfDetletionAttempts);
+ noOfDetletionAttempts++;
+ User::After(KRetryInterval);
+ }
+
if(err !=KErrNone && err != KErrNotFound && err != KErrPathNotFound && err != KErrNotReady && err != KErrCorrupt)
{
- CDisplayError* displayCannotDelete=CDisplayError::NewLC(iPlan.AppInfoL(), EUiCannotDelete, fileToRemove);
+ CDisplayError* displayCannotDelete=CDisplayError::NewLC(iPlan.AppInfoL(), EUiCannotDelete, fileToRemove);
iUiHandler.ExecuteL(*displayCannotDelete);
CleanupStack::PopAndDestroy(displayCannotDelete);
User::Leave(err);
@@ -834,6 +848,20 @@
#else
TRAP(err, IntegrityServices().RemoveL(privatePath));
#endif
+
+ TInt noOfDetletionAttempts=1;
+ while ((err == KErrInUse ||err==KErrAccessDenied )&& noOfDetletionAttempts <= KMaxNoOfDeletionAttempts )
+ {
+#ifdef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK
+ TRAP(err, TransactionSession().RemoveL(privatePath));
+#else
+ TRAP(err, IntegrityServices().RemoveL(privatePath));
+#endif
+ DEBUG_PRINTF2(_L8("Deletion attempt %d"), noOfDetletionAttempts);
+ noOfDetletionAttempts++;
+ User::After(KRetryInterval);
+ }
+
if (err != KErrNone && err != KErrNotReady &&
err != KErrNotFound && err != KErrPathNotFound && err != KErrCorrupt)
{
--- a/installationservices/swi/source/swis/server/processor.h Fri Mar 12 15:43:14 2010 +0200
+++ b/installationservices/swi/source/swis/server/processor.h Mon Mar 15 12:41:05 2010 +0200
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2004-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2004-2010 Nokia Corporation and/or its subsidiary(-ies).
* All rights reserved.
* This component and the accompanying materials are made available
* under the terms of the License "Eclipse Public License v1.0"
@@ -43,6 +43,8 @@
namespace Swi
{
+const TInt KMaxNoOfDeletionAttempts=3;
+const TInt KRetryInterval=250000;
#ifndef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK
class CIntegrityServices;
#endif
--- a/installationservices/swi/source/swis/server/restoremachine.cpp Fri Mar 12 15:43:14 2010 +0200
+++ b/installationservices/swi/source/swis/server/restoremachine.cpp Mon Mar 15 12:41:05 2010 +0200
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2004-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2004-2010 Nokia Corporation and/or its subsidiary(-ies).
* All rights reserved.
* This component and the accompanying materials are made available
* under the terms of the License "Eclipse Public License v1.0"
@@ -37,7 +37,6 @@
#include "log.h"
#include "swispubsubdefs.h"
#include "securitycheckutil.h"
-#include "secutils.h"
#include "cleanuputils.h"
#include "sisversion.h"
#include "sisregistrywritablesession.h"
@@ -140,6 +139,25 @@
{
CheckVersionUpgradeL();
}
+ //Publish package Uid which is going to be restored.
+ err = SecUtils::PublishPackageUid(iPackageUid, iUidList);
+ if (err == KErrNone)
+ {
+ DEBUG_PRINTF2(_L("CRestoreMachine::ConstructL published Uid is %x."),iPackageUid);
+ }
+ else if (err == KErrOverflow)
+ {
+ DEBUG_PRINTF2(_L("CRestoreMachine::ConstructL Failed to publish Uid %x as the array, holding the uids, exceeded its upper limit."),iPackageUid);
+ }
+ else if (err == KErrNotFound)
+ {
+ DEBUG_PRINTF2(_L("CRestoreMachine::ConstructL Failed to publish Uid %x as the property is not defined."),iPackageUid);
+ }
+ else
+ {
+ DEBUG_PRINTF3(_L("CRestoreMachine::ConstructL Failed to publish Uid %x with error %d."),iPackageUid, err);
+ User::Leave(err);
+ }
#ifdef SYMBIAN_USER_PROMPT_SERVICE
//connect to the SWI Observer
--- a/installationservices/swi/source/swis/server/restoremachine.h Fri Mar 12 15:43:14 2010 +0200
+++ b/installationservices/swi/source/swis/server/restoremachine.h Mon Mar 15 12:41:05 2010 +0200
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2004-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2004-2010 Nokia Corporation and/or its subsidiary(-ies).
* All rights reserved.
* This component and the accompanying materials are made available
* under the terms of the License "Eclipse Public License v1.0"
@@ -29,6 +29,7 @@
#include "installationprocessor.h"
#include "swi/siscontroller.h"
#include "sisregistrywritablesession.h"
+#include "secutils.h"
namespace Swi
{
@@ -170,6 +171,9 @@
TChar iSystemDriveChar;
RSwiObserverSession iObserver; ///< Swi Observer session handle.
HBufC8 *iBuf;
+
+ //An array whose first element holds the number of uids in the subsequent indices of the array, followed by the the list of uids that are being published.
+ TUid iUidList[KMaxUidCount];
};
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/installationservices/swi/source/swiutils/swiutils.cpp Mon Mar 15 12:41:05 2010 +0200
@@ -0,0 +1,52 @@
+/*
+* Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of the License "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+* swiutils.cpp
+*/
+
+#include <e32def.h>
+#include <e32cmn.h>
+#include <e32property.h>
+#include <sacls.h>
+#include "swiutils.h"
+#include "log.h"
+
+namespace Swi{
+
+EXPORT_C TInt GetAllUids(RArray<TUid>& aUidList)
+ {
+ aUidList.Close();
+
+ TBuf<KMaxUidCount*sizeof(TUid)> buf;
+ TInt err = RProperty::Get(KUidSystemCategory, KSWIUidsCurrentlyBeingProcessed, buf);
+ if(err != KErrNone)
+ {
+ DEBUG_PRINTF2(_L("RProperty::Get returned with err %d."), err);
+ return err;
+ }
+
+ TInt count = 0;
+ TInt *bufPtr = (TInt*) buf.Ptr();
+ count = *bufPtr++;
+
+ TUid uid;
+ for(TInt i = 0; i < count; ++i)
+ {
+ uid.iUid = *bufPtr++;
+ aUidList.Append(uid);
+ }
+
+ return KErrNone;
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/installationservices/swi/source/swiutils/swiutils.h Mon Mar 15 12:41:05 2010 +0200
@@ -0,0 +1,43 @@
+/*
+* Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of the License "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+* swiutils.h
+*/
+
+/**
+ @file
+ @publishedAll
+ @released
+*/
+
+
+#ifndef __SWIUTILS_H__
+#define __SWIUTILS_H__
+
+#include <e32def.h>
+#include <e32cmn.h>
+
+namespace Swi
+ {
+ const TInt KMaxUidCount = 16; //One more than the maximum number of Uids that the array, publishing the Uids, holds
+
+ /**
+ * Returns an array of package Uids published by the installer.
+ * @param aUidList Array which holds a list of Uids that is published.
+ * @return KErrNone in case of success otherwise one of the system-wide error codes.
+ */
+ IMPORT_C TInt GetAllUids(RArray<TUid>& aUidList);
+ } //end of namespace SWI
+
+#endif
--- a/installationservices/swi/test/tbackuprestore/scripts/batchfiles/tbackuprestore_post.bat Fri Mar 12 15:43:14 2010 +0200
+++ b/installationservices/swi/test/tbackuprestore/scripts/batchfiles/tbackuprestore_post.bat Mon Mar 15 12:41:05 2010 +0200
@@ -20,4 +20,13 @@
del /s /f /q \epoc32\release\winscw\urel\z\sys\bin\tswisidupgradeexe.exe
del /s /f /q \epoc32\winscw\c\tswi\tbackuprestore\backup*.*
-del /s /f /q \epoc32\winscw\c\tswi\tbackuprestore\metadata*
\ No newline at end of file
+del /s /f /q \epoc32\winscw\c\tswi\tbackuprestore\metadata*
+
+rem cleanup anything from previous tests.
+del /f /q \epoc32\winscw\c\sys\install\scr\scr.*
+del /s /f /q \epoc32\winscw\c\sys\install\sisregistry\802730A0
+del /s /f /q \epoc32\winscw\c\sys\install\sisregistry\80000077
+del /s /f /q \epoc32\winscw\c\sys\install\sisregistry\80000076
+del /s /f /q \epoc32\winscw\c\sys\install\sisregistry\
+del /s /f /q \epoc32\winscw\c\sys\bin\
+del /s /f /q \epoc32\winscw\c\sys\hash\
\ No newline at end of file
--- a/installationservices/swi/test/tbackuprestore/scripts/ini Fri Mar 12 15:43:14 2010 +0200
+++ b/installationservices/swi/test/tbackuprestore/scripts/ini Mon Mar 15 12:41:05 2010 +0200
@@ -4,6 +4,45 @@
FILE1.1 = C:\sys\bin\tswinocapability.exe
INSTALLDRIVE1 = C
+[A1_NR]
+SIS1 = c:\tswi\tsis\data\int_nr_option_05_sucert.sis
+UID1 = 80000077
+DATA1.1 = C:\Documents\abc4.txt
+INSTALLDRIVE1 = C
+UninstallResult = -5
+
+[NR_SP]
+SIS1 = c:\tswi\tsis\data\sp_int_nr_option_06_sucert.sis
+UID1 = 80000076
+DATA1.1 = C:\Documents\abc5.txt
+INSTALLDRIVE1 = C
+UninstallResult = -5
+
+[A_NR]
+SIS1 = c:\tswi\tsis\data\int_nr_option_04_sucert.sis
+UID1 = 80000076
+DATA1.1 = C:\Documents\abc1.txt
+INSTALLDRIVE1 = C
+UninstallResult = -5
+
+[A_SP]
+SIS1 = c:\tswi\tsis\data\sp_int_nr_option_04.sis
+UID1 = 80000076
+DATA1.1 = C:\Documents\abc3.txt
+INSTALLDRIVE1 = C
+
+[A_SP_U]
+uid=80000076
+vendorName=Nokia
+packageName=Interpretsis_NR_option_SP
+script=c:\tswi\tuiscriptadaptors\scripts\uninstall.xml
+
+[A_SP_U_NR]
+uid=80000076
+vendorName=Nokia
+packageName=Interpretsis_NR_option_SP_NR
+script=c:\tswi\tuiscriptadaptors\scripts\uninstall.xml
+
[B]
SIS1 = z:\tswi\tsis\data\tswiusergrantable_RSACA_DSACA.sis
UID1 = 81113022
@@ -1284,3 +1323,14 @@
[ROM_SP_backup_restore]
UID1 = 88000110
SIS1 = z:\tswi\tsis\data\a_sp.sis
+
+[defineProperty]
+DefineProperty=true
+
+[API-INST-PAS-SWI-0001]
+PublishedUidCount=1
+PublishedUidValue0=88000105
+
+[API-INST-PAS-SWI-0001-A]
+PublishedUidCount=1
+PublishedUidValue0=88000106
\ No newline at end of file
--- a/installationservices/swi/test/tbackuprestore/scripts/ini_armv5 Fri Mar 12 15:43:14 2010 +0200
+++ b/installationservices/swi/test/tbackuprestore/scripts/ini_armv5 Mon Mar 15 12:41:05 2010 +0200
@@ -4,6 +4,45 @@
FILE1.1 = C:\sys\bin\tswinocapability.exe
INSTALLDRIVE1 = C
+[A1_NR]
+SIS1 = z:\tswi\tsis\data\int_nr_option_05_sucert.sis
+UID1 = 80000077
+DATA1.1 = C:\Documents\abc4.txt
+INSTALLDRIVE1 = C
+UninstallResult = -5
+
+[NR_SP]
+SIS1 = z:\tswi\tsis\data\sp_int_nr_option_06_sucert.sis
+UID1 = 80000076
+DATA1.1 = C:\Documents\abc5.txt
+INSTALLDRIVE1 = C
+UninstallResult = -5
+
+[A_NR]
+SIS1 = z:\tswi\tsis\data\int_nr_option_04_sucert.sis
+UID1 = 80000076
+DATA1.1 = C:\Documents\abc1.txt
+INSTALLDRIVE1 = C
+UninstallResult = -5
+
+[A_SP]
+SIS1 = z:\tswi\tsis\data\sp_int_nr_option_04.sis
+UID1 = 80000076
+DATA1.1 = C:\Documents\abc3.txt
+INSTALLDRIVE1 = C
+
+[A_SP_U]
+uid=80000076
+vendorName=Nokia
+packageName=Interpretsis_NR_option_SP
+script=z:\tswi\tuiscriptadaptors\scripts\uninstall.xml
+
+[A_SP_U_NR]
+uid=80000076
+vendorName=Nokia
+packageName=Interpretsis_NR_option_SP_NR
+script=z:\tswi\tuiscriptadaptors\scripts\uninstall.xml
+
[B]
SIS1 = z:\tswi\tsis\data\tswiusergrantable_RSACA_DSACA.sis
UID1 = 81113022
@@ -859,3 +898,17 @@
FILE1.2 = C:\Documents\InstTest\testhugecontroller1.txt
INSTALLDRIVE1 = C
+[defineProperty]
+DefineProperty=true
+
+[API-INST-PAS-SWI-0001]
+PublishedUidCount=1
+PublishedUidValue0=88000105
+
+[API-INST-PAS-SWI-0001-A]
+PublishedUidCount=1
+PublishedUidValue0=88000106
+
+[API-INST-PAS-SWI-0002]
+PublishedUidCount=1
+PublishedUidValue0=81113001
\ No newline at end of file
--- a/installationservices/swi/test/tbackuprestore/scripts/tbackuprestore.script Fri Mar 12 15:43:14 2010 +0200
+++ b/installationservices/swi/test/tbackuprestore/scripts/tbackuprestore.script Mon Mar 15 12:41:05 2010 +0200
@@ -1,5 +1,5 @@
//
-// Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2009-2010 Nokia Corporation and/or its subsidiary(-ies).
// All rights reserved.
// This component and the accompanying materials are made available
// under the terms of the License "Eclipse Public License v1.0"
@@ -73,9 +73,12 @@
RUN_TEST_STEP 100 tbackuprestore UNINSTALL z:\tswi\tbackuprestore\scripts\ini install_en_fr
RUN_TEST_STEP 100 tbackuprestore ABSENT z:\tswi\tbackuprestore\scripts\ini install_en_fr_emb
RUN_TEST_STEP 100 tSisRegistryTest ChangeLocale z:\tswi\tbackuprestore\scripts\ini langauge_to_german
-
+RUN_TEST_STEP 100 tuiscriptadaptors GetPublishedUidArrayStep z:\tswi\tbackuprestore\scripts\ini defineProperty
RUN_TEST_STEP 100 tbackuprestore RESTORE z:\tswi\tbackuprestore\scripts\ini install_en_fr_emb
+RUN_TEST_STEP 100 tuiscriptadaptors GetPublishedUidArrayStep z:\tswi\tbackuprestore\scripts\ini API-INST-PAS-SWI-0001
+RUN_TEST_STEP 100 tuiscriptadaptors GetPublishedUidArrayStep z:\tswi\tbackuprestore\scripts\ini defineProperty
RUN_TEST_STEP 100 tbackuprestore RESTORE z:\tswi\tbackuprestore\scripts\ini install_en_fr_base
+RUN_TEST_STEP 100 tuiscriptadaptors GetPublishedUidArrayStep z:\tswi\tbackuprestore\scripts\ini API-INST-PAS-SWI-0001-A
RUN_TEST_STEP 100 tbackuprestore PRESENT z:\tswi\tbackuprestore\scripts\ini install_en_fr
RUN_TEST_STEP 100 tSisRegistryTest IsPackageInstalled z:\tswi\tbackuprestore\scripts\ini package_info_german
@@ -172,8 +175,12 @@
RUN_TEST_STEP 100 tbackuprestore BACKUP z:\tswi\tbackuprestore\scripts\ini install_en_fr_base
RUN_TEST_STEP 100 tbackuprestore PRESENT z:\tswi\tbackuprestore\scripts\ini install_en_fr
+RUN_TEST_STEP 100 tuiscriptadaptors GetPublishedUidArrayStep z:\tswi\tbackuprestore\scripts\ini defineProperty
RUN_TEST_STEP 100 tbackuprestore RESTORE z:\tswi\tbackuprestore\scripts\ini install_en_fr_emb
+RUN_TEST_STEP 100 tuiscriptadaptors GetPublishedUidArrayStep z:\tswi\tbackuprestore\scripts\ini API-INST-PAS-SWI-0001
+RUN_TEST_STEP 100 tuiscriptadaptors GetPublishedUidArrayStep z:\tswi\tbackuprestore\scripts\ini defineProperty
RUN_TEST_STEP 100 tbackuprestore RESTORE z:\tswi\tbackuprestore\scripts\ini install_en_fr_base
+RUN_TEST_STEP 100 tuiscriptadaptors GetPublishedUidArrayStep z:\tswi\tbackuprestore\scripts\ini API-INST-PAS-SWI-0001-A
RUN_TEST_STEP 100 tbackuprestore PRESENT z:\tswi\tbackuprestore\scripts\ini install_en_fr
@@ -241,11 +248,11 @@
RUN_TEST_STEP 100 tbackuprestore INSTALL z:\tswi\tbackuprestore\scripts\ini romstubpu
RUN_TEST_STEP 100 tbackuprestore PRESENT z:\tswi\tbackuprestore\scripts\ini romstubpu
- RUN_TEST_STEP 100 tbackuprestore BACKUP z:\tswi\tbackuprestore\scripts\ini romstubpu
+ RUN_TEST_STEP_RESULT -5 100 tbackuprestore BACKUP z:\tswi\tbackuprestore\scripts\ini romstubpu
RUN_TEST_STEP 100 tbackuprestore PRESENT z:\tswi\tbackuprestore\scripts\ini romstubpu
- RUN_TEST_STEP 100 tbackuprestore RESTORE z:\tswi\tbackuprestore\scripts\ini romstubpu
- RUN_TEST_STEP 100 tbackuprestore PRESENT z:\tswi\tbackuprestore\scripts\ini romstubpu
+ //RUN_TEST_STEP 100 tbackuprestore RESTORE z:\tswi\tbackuprestore\scripts\ini romstubpu
+ //RUN_TEST_STEP 100 tbackuprestore PRESENT z:\tswi\tbackuprestore\scripts\ini romstubpu
RUN_TEST_STEP 100 tbackuprestore INSTALL z:\tswi\tbackuprestore\scripts\ini romstubsaru
RUN_TEST_STEP 100 tbackuprestore PRESENT z:\tswi\tbackuprestore\scripts\ini romstubsaru
@@ -1810,7 +1817,7 @@
RUN_TEST_STEP 100 tbackuprestore INSTALL z:\tswi\tbackuprestore\scripts\ini romstubpu
RUN_TEST_STEP 100 tbackuprestore PRESENT z:\tswi\tbackuprestore\scripts\ini romstubpu
-RUN_TEST_STEP 100 tbackuprestore BACKUP z:\tswi\tbackuprestore\scripts\ini romstubpu
+RUN_TEST_STEP_RESULT -5 100 tbackuprestore BACKUP z:\tswi\tbackuprestore\scripts\ini romstubpu
RUN_TEST_STEP 100 tbackuprestore PRESENT z:\tswi\tbackuprestore\scripts\ini romstubpu
RUN_TEST_STEP 100 tbackuprestore INSTALL z:\tswi\tbackuprestore\scripts\ini romstubsaru
@@ -1819,8 +1826,8 @@
RUN_TEST_STEP 100 tbackuprestore UNINSTALL z:\tswi\tbackuprestore\scripts\ini romstubsaru
RUN_TEST_STEP 100 tuiscriptadaptors MmcCheckFilesStep z:\tswi\tbackuprestore\scripts\ini romstubsaru_clean
-RUN_TEST_STEP 100 tbackuprestore RESTORE z:\tswi\tbackuprestore\scripts\ini romstubpu
-RUN_TEST_STEP 100 tbackuprestore PRESENT z:\tswi\tbackuprestore\scripts\ini romstubpu
+//RUN_TEST_STEP 100 tbackuprestore RESTORE z:\tswi\tbackuprestore\scripts\ini romstubpu
+//RUN_TEST_STEP 100 tbackuprestore PRESENT z:\tswi\tbackuprestore\scripts\ini romstubpu
RUN_TEST_STEP 100 tbackuprestore INSTALL z:\tswi\tbackuprestore\scripts\ini romstubsaru
RUN_TEST_STEP 100 tbackuprestore PRESENT z:\tswi\tbackuprestore\scripts\ini romstubsaru
@@ -1830,6 +1837,99 @@
END_TESTCASE API-SEC-INC126755-0002
+//! @SYMTestCaseID API-SEC-BACKUPNONREMOVABLE-0001
+//! @SYMTestCaseDesc Checks backup of NR SA
+//! @SYMTestPriority High
+//! @SYMTestStatus 3. Released
+//! @SYMTestActions Installs, backs up, uninstalls,
+//! @SYMTestExpectedResults Install Success, Backup and Uninstall Fails.
+//! @SYMREQ REQ405-4255
+//! @SYMTestType UT
+
+START_TESTCASE API-SEC-BACKUPNONREMOVABLE-0001
+
+RUN_TEST_STEP 100 tbackuprestore INSTALL z:\tswi\tbackuprestore\scripts\ini A1_NR
+RUN_TEST_STEP 100 tbackuprestore PRESENT z:\tswi\tbackuprestore\scripts\ini A1_NR
+
+RUN_TEST_STEP_RESULT -5 100 tbackuprestore BACKUP z:\tswi\tbackuprestore\scripts\ini A1_NR
+RUN_TEST_STEP 100 tbackuprestore PRESENT z:\tswi\tbackuprestore\scripts\ini A1_NR
+
+RUN_TEST_STEP 100 tbackuprestore UNINSTALL z:\tswi\tbackuprestore\scripts\ini A1_NR
+RUN_TEST_STEP 100 tbackuprestore PRESENT z:\tswi\tbackuprestore\scripts\ini A1_NR
+
+END_TESTCASE API-SEC-BACKUPNONREMOVABLE-0001
+
+//! @SYMTestCaseID API-SEC-BACKUPNONREMOVABLE-0002
+//! @SYMTestCaseDesc Checks backup of SP Over NR SA
+//! @SYMTestPriority High
+//! @SYMTestStatus 3. Released
+//! @SYMTestActions Installs, backs up, uninstalls
+//! @SYMTestExpectedResults Success, clean environment.
+//! @SYMREQ REQ405-4255
+//! @SYMTestType UT
+
+START_TESTCASE API-SEC-BACKUPNONREMOVABLE-0002
+
+RUN_TEST_STEP 100 tbackuprestore INSTALL z:\tswi\tbackuprestore\scripts\ini A_NR
+RUN_TEST_STEP 100 tbackuprestore PRESENT z:\tswi\tbackuprestore\scripts\ini A_NR
+
+RUN_TEST_STEP_RESULT -5 100 tbackuprestore BACKUP z:\tswi\tbackuprestore\scripts\ini A_NR
+RUN_TEST_STEP 100 tbackuprestore PRESENT z:\tswi\tbackuprestore\scripts\ini A_NR
+
+RUN_TEST_STEP 100 tbackuprestore UNINSTALL z:\tswi\tbackuprestore\scripts\ini A_NR
+RUN_TEST_STEP 100 tbackuprestore PRESENT z:\tswi\tbackuprestore\scripts\ini A_NR
+
+RUN_TEST_STEP 100 tbackuprestore INSTALL z:\tswi\tbackuprestore\scripts\ini A_SP
+RUN_TEST_STEP 100 tbackuprestore PRESENT z:\tswi\tbackuprestore\scripts\ini A_SP
+
+RUN_TEST_STEP 100 tbackuprestore BACKUP z:\tswi\tbackuprestore\scripts\ini A_SP
+RUN_TEST_STEP 100 tbackuprestore PRESENT z:\tswi\tbackuprestore\scripts\ini A_SP
+
+RUN_TEST_STEP 100 tuiscriptadaptors UninstallAugStep z:\tswi\tbackuprestore\scripts\ini A_SP_U
+
+END_TESTCASE API-SEC-BACKUPNONREMOVABLE-0002
+
+//! @SYMTestCaseID API-SEC-BACKUPNONREMOVABLE-0003
+//! @SYMTestCaseDesc Checks backup of SP Over NR SP Over NR SA
+//! @SYMTestPriority High
+//! @SYMTestStatus 3. Released
+//! @SYMTestActions Installs, backs up, uninstalls
+//! @SYMTestExpectedResults Success, clean environment.
+//! @SYMREQ REQ405-4255
+//! @SYMTestType UT
+
+START_TESTCASE API-SEC-BACKUPNONREMOVABLE-0003
+
+RUN_TEST_STEP 100 tbackuprestore INSTALL z:\tswi\tbackuprestore\scripts\ini A_NR
+RUN_TEST_STEP 100 tbackuprestore PRESENT z:\tswi\tbackuprestore\scripts\ini A_NR
+
+RUN_TEST_STEP_RESULT -5 100 tbackuprestore BACKUP z:\tswi\tbackuprestore\scripts\ini A_NR
+RUN_TEST_STEP 100 tbackuprestore PRESENT z:\tswi\tbackuprestore\scripts\ini A_NR
+
+RUN_TEST_STEP 100 tbackuprestore UNINSTALL z:\tswi\tbackuprestore\scripts\ini A_NR
+RUN_TEST_STEP 100 tbackuprestore PRESENT z:\tswi\tbackuprestore\scripts\ini A_NR
+
+RUN_TEST_STEP 100 tbackuprestore INSTALL z:\tswi\tbackuprestore\scripts\ini NR_SP
+RUN_TEST_STEP 100 tbackuprestore PRESENT z:\tswi\tbackuprestore\scripts\ini NR_SP
+
+RUN_TEST_STEP_RESULT -5 100 tbackuprestore BACKUP z:\tswi\tbackuprestore\scripts\ini NR_SP
+RUN_TEST_STEP 100 tbackuprestore PRESENT z:\tswi\tbackuprestore\scripts\ini NR_SP
+
+RUN_TEST_STEP_RESULT -5 100 tuiscriptadaptors UninstallAugStep z:\tswi\tbackuprestore\scripts\ini A_SP_U_NR
+
+RUN_TEST_STEP 100 tbackuprestore PRESENT z:\tswi\tbackuprestore\scripts\ini NR_SP
+
+RUN_TEST_STEP 100 tbackuprestore INSTALL z:\tswi\tbackuprestore\scripts\ini A_SP
+RUN_TEST_STEP 100 tbackuprestore PRESENT z:\tswi\tbackuprestore\scripts\ini A_SP
+
+RUN_TEST_STEP 100 tbackuprestore BACKUP z:\tswi\tbackuprestore\scripts\ini A_SP
+RUN_TEST_STEP 100 tbackuprestore PRESENT z:\tswi\tbackuprestore\scripts\ini A_SP
+
+RUN_TEST_STEP 100 tuiscriptadaptors UninstallAugStep z:\tswi\tbackuprestore\scripts\ini A_SP_U
+
+END_TESTCASE API-SEC-BACKUPNONREMOVABLE-0003
+
+RUN_UTILS DeleteFile C:\Documents\abc*.txt
// Ensure that SWIS shuts down after the above tests to make sure heap checks run
RUN_TEST_STEP 5 tuiscriptadaptors SwisNotRunning
--- a/installationservices/swi/test/tbackuprestore/scripts/tbackuprestore_armv5.script Fri Mar 12 15:43:14 2010 +0200
+++ b/installationservices/swi/test/tbackuprestore/scripts/tbackuprestore_armv5.script Mon Mar 15 12:41:05 2010 +0200
@@ -1,5 +1,5 @@
//
-// Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2009-2010 Nokia Corporation and/or its subsidiary(-ies).
// All rights reserved.
// This component and the accompanying materials are made available
// under the terms of the License "Eclipse Public License v1.0"
@@ -69,9 +69,12 @@
RUN_TEST_STEP 100 tbackuprestore UNINSTALL z:\tswi\tbackuprestore\scripts\ini install_en_fr
RUN_TEST_STEP 100 tbackuprestore ABSENT z:\tswi\tbackuprestore\scripts\ini install_en_fr_emb
RUN_TEST_STEP 100 tSisRegistryTest ChangeLocale z:\tswi\tbackuprestore\scripts\ini langauge_to_german
-
+RUN_TEST_STEP 100 tuiscriptadaptors GetPublishedUidArrayStep z:\tswi\tbackuprestore\scripts\ini defineProperty
RUN_TEST_STEP 100 tbackuprestore RESTORE z:\tswi\tbackuprestore\scripts\ini install_en_fr_emb
+RUN_TEST_STEP 100 tuiscriptadaptors GetPublishedUidArrayStep z:\tswi\tbackuprestore\scripts\ini API-INST-PAS-SWI-0001
+RUN_TEST_STEP 100 tuiscriptadaptors GetPublishedUidArrayStep z:\tswi\tbackuprestore\scripts\ini defineProperty
RUN_TEST_STEP 100 tbackuprestore RESTORE z:\tswi\tbackuprestore\scripts\ini install_en_fr_base
+RUN_TEST_STEP 100 tuiscriptadaptors GetPublishedUidArrayStep z:\tswi\tbackuprestore\scripts\ini API-INST-PAS-SWI-0001-A
RUN_TEST_STEP 100 tbackuprestore PRESENT z:\tswi\tbackuprestore\scripts\ini install_en_fr
RUN_TEST_STEP 100 tSisRegistryTest IsPackageInstalled z:\tswi\tbackuprestore\scripts\ini package_info_german
@@ -167,8 +170,10 @@
RUN_TEST_STEP 100 tbackuprestore BACKUP z:\tswi\tbackuprestore\scripts\ini A
RUN_TEST_STEP 100 tbackuprestore PRESENT z:\tswi\tbackuprestore\scripts\ini A
-
+
+ RUN_TEST_STEP 100 tuiscriptadaptors GetPublishedUidArrayStep z:\tswi\tbackuprestore\scripts\ini defineProperty
RUN_TEST_STEP 100 tbackuprestore RESTORE z:\tswi\tbackuprestore\scripts\ini A
+ RUN_TEST_STEP 100 tuiscriptadaptors GetPublishedUidArrayStep z:\tswi\tbackuprestore\scripts\ini API-INST-PAS-SWI-0002
RUN_TEST_STEP 100 tbackuprestore PRESENT z:\tswi\tbackuprestore\scripts\ini A
RUN_TEST_STEP 100 tbackuprestore UNINSTALL z:\tswi\tbackuprestore\scripts\ini A
@@ -212,11 +217,11 @@
RUN_TEST_STEP 100 tbackuprestore INSTALL z:\tswi\tbackuprestore\scripts\ini romstubpu
RUN_TEST_STEP 100 tbackuprestore PRESENT z:\tswi\tbackuprestore\scripts\ini romstubpu
- RUN_TEST_STEP 100 tbackuprestore BACKUP z:\tswi\tbackuprestore\scripts\ini romstubpu
+ RUN_TEST_STEP_RESULT -5 100 tbackuprestore BACKUP z:\tswi\tbackuprestore\scripts\ini romstubpu
RUN_TEST_STEP 100 tbackuprestore PRESENT z:\tswi\tbackuprestore\scripts\ini romstubpu
- RUN_TEST_STEP 100 tbackuprestore RESTORE z:\tswi\tbackuprestore\scripts\ini romstubpu
- RUN_TEST_STEP 100 tbackuprestore PRESENT z:\tswi\tbackuprestore\scripts\ini romstubpu
+ //RUN_TEST_STEP 100 tbackuprestore RESTORE z:\tswi\tbackuprestore\scripts\ini romstubpu
+ //RUN_TEST_STEP 100 tbackuprestore PRESENT z:\tswi\tbackuprestore\scripts\ini romstubpu
RUN_TEST_STEP 100 tbackuprestore INSTALL z:\tswi\tbackuprestore\scripts\ini romstubsaru
RUN_TEST_STEP 100 tbackuprestore PRESENT z:\tswi\tbackuprestore\scripts\ini romstubsaru
@@ -1596,7 +1601,7 @@
RUN_TEST_STEP 100 tbackuprestore INSTALL z:\tswi\tbackuprestore\scripts\ini romstubpu
RUN_TEST_STEP 100 tbackuprestore PRESENT z:\tswi\tbackuprestore\scripts\ini romstubpu
-RUN_TEST_STEP 100 tbackuprestore BACKUP z:\tswi\tbackuprestore\scripts\ini romstubpu
+RUN_TEST_STEP_RESULT -5 100 tbackuprestore BACKUP z:\tswi\tbackuprestore\scripts\ini romstubpu
RUN_TEST_STEP 100 tbackuprestore PRESENT z:\tswi\tbackuprestore\scripts\ini romstubpu
RUN_TEST_STEP 100 tbackuprestore INSTALL z:\tswi\tbackuprestore\scripts\ini romstubsaru
@@ -1605,8 +1610,8 @@
RUN_TEST_STEP 100 tbackuprestore UNINSTALL z:\tswi\tbackuprestore\scripts\ini romstubsaru
RUN_TEST_STEP 100 tuiscriptadaptors MmcCheckFilesStep z:\tswi\tbackuprestore\scripts\ini romstubsaru_clean
-RUN_TEST_STEP 100 tbackuprestore RESTORE z:\tswi\tbackuprestore\scripts\ini romstubpu
-RUN_TEST_STEP 100 tbackuprestore PRESENT z:\tswi\tbackuprestore\scripts\ini romstubpu
+//RUN_TEST_STEP 100 tbackuprestore RESTORE z:\tswi\tbackuprestore\scripts\ini romstubpu
+//RUN_TEST_STEP 100 tbackuprestore PRESENT z:\tswi\tbackuprestore\scripts\ini romstubpu
RUN_TEST_STEP 100 tbackuprestore INSTALL z:\tswi\tbackuprestore\scripts\ini romstubsaru
RUN_TEST_STEP 100 tbackuprestore PRESENT z:\tswi\tbackuprestore\scripts\ini romstubsaru
@@ -1642,6 +1647,99 @@
END_TESTCASE API-SEC-SWI-DEF140527_HUGE_CTL_PU-HW-0001
+//! @SYMTestCaseID API-SEC-BACKUPNONREMOVABLE-HW-0001
+//! @SYMTestCaseDesc Checks backup of NR SA
+//! @SYMTestPriority High
+//! @SYMTestStatus 3. Released
+//! @SYMTestActions Installs, backs up, uninstalls,
+//! @SYMTestExpectedResults Install Success, Backup and Uninstall Fails.
+//! @SYMREQ REQ405-4255
+//! @SYMTestType UT
+
+START_TESTCASE API-SEC-BACKUPNONREMOVABLE-HW-0001
+
+RUN_TEST_STEP 100 tbackuprestore INSTALL z:\tswi\tbackuprestore\scripts\ini A1_NR
+RUN_TEST_STEP 100 tbackuprestore PRESENT z:\tswi\tbackuprestore\scripts\ini A1_NR
+
+RUN_TEST_STEP_RESULT -5 100 tbackuprestore BACKUP z:\tswi\tbackuprestore\scripts\ini A1_NR
+RUN_TEST_STEP 100 tbackuprestore PRESENT z:\tswi\tbackuprestore\scripts\ini A1_NR
+
+RUN_TEST_STEP 100 tbackuprestore UNINSTALL z:\tswi\tbackuprestore\scripts\ini A1_NR
+RUN_TEST_STEP 100 tbackuprestore PRESENT z:\tswi\tbackuprestore\scripts\ini A1_NR
+
+END_TESTCASE API-SEC-BACKUPNONREMOVABLE-HW-0001
+
+//! @SYMTestCaseID API-SEC-BACKUPNONREMOVABLE-HW-0002
+//! @SYMTestCaseDesc Checks backup of SP Over NR SA
+//! @SYMTestPriority High
+//! @SYMTestStatus 3. Released
+//! @SYMTestActions Installs, backs up, uninstalls
+//! @SYMTestExpectedResults Success, clean environment.
+//! @SYMREQ REQ405-4255
+//! @SYMTestType UT
+
+START_TESTCASE API-SEC-BACKUPNONREMOVABLE-HW-0002
+
+RUN_TEST_STEP 100 tbackuprestore INSTALL z:\tswi\tbackuprestore\scripts\ini A_NR
+RUN_TEST_STEP 100 tbackuprestore PRESENT z:\tswi\tbackuprestore\scripts\ini A_NR
+
+RUN_TEST_STEP_RESULT -5 100 tbackuprestore BACKUP z:\tswi\tbackuprestore\scripts\ini A_NR
+RUN_TEST_STEP 100 tbackuprestore PRESENT z:\tswi\tbackuprestore\scripts\ini A_NR
+
+RUN_TEST_STEP 100 tbackuprestore UNINSTALL z:\tswi\tbackuprestore\scripts\ini A_NR
+RUN_TEST_STEP 100 tbackuprestore PRESENT z:\tswi\tbackuprestore\scripts\ini A_NR
+
+RUN_TEST_STEP 100 tbackuprestore INSTALL z:\tswi\tbackuprestore\scripts\ini A_SP
+RUN_TEST_STEP 100 tbackuprestore PRESENT z:\tswi\tbackuprestore\scripts\ini A_SP
+
+RUN_TEST_STEP 100 tbackuprestore BACKUP z:\tswi\tbackuprestore\scripts\ini A_SP
+RUN_TEST_STEP 100 tbackuprestore PRESENT z:\tswi\tbackuprestore\scripts\ini A_SP
+
+RUN_TEST_STEP 100 tuiscriptadaptors UninstallAugStep z:\tswi\tbackuprestore\scripts\ini A_SP_U
+
+END_TESTCASE API-SEC-BACKUPNONREMOVABLE-HW-0002
+
+//! @SYMTestCaseID API-SEC-BACKUPNONREMOVABLE-HW-0003
+//! @SYMTestCaseDesc Checks backup of SP Over NR SP Over NR SA
+//! @SYMTestPriority High
+//! @SYMTestStatus 3. Released
+//! @SYMTestActions Installs, backs up, uninstalls
+//! @SYMTestExpectedResults Success, clean environment.
+//! @SYMREQ REQ405-4255
+//! @SYMTestType UT
+
+START_TESTCASE API-SEC-BACKUPNONREMOVABLE-HW-0003
+
+RUN_TEST_STEP 100 tbackuprestore INSTALL z:\tswi\tbackuprestore\scripts\ini A_NR
+RUN_TEST_STEP 100 tbackuprestore PRESENT z:\tswi\tbackuprestore\scripts\ini A_NR
+
+RUN_TEST_STEP_RESULT -5 100 tbackuprestore BACKUP z:\tswi\tbackuprestore\scripts\ini A_NR
+RUN_TEST_STEP 100 tbackuprestore PRESENT z:\tswi\tbackuprestore\scripts\ini A_NR
+
+RUN_TEST_STEP 100 tbackuprestore UNINSTALL z:\tswi\tbackuprestore\scripts\ini A_NR
+RUN_TEST_STEP 100 tbackuprestore PRESENT z:\tswi\tbackuprestore\scripts\ini A_NR
+
+RUN_TEST_STEP 100 tbackuprestore INSTALL z:\tswi\tbackuprestore\scripts\ini NR_SP
+RUN_TEST_STEP 100 tbackuprestore PRESENT z:\tswi\tbackuprestore\scripts\ini NR_SP
+
+RUN_TEST_STEP_RESULT -5 100 tbackuprestore BACKUP z:\tswi\tbackuprestore\scripts\ini NR_SP
+RUN_TEST_STEP 100 tbackuprestore PRESENT z:\tswi\tbackuprestore\scripts\ini NR_SP
+
+RUN_TEST_STEP_RESULT -5 100 tuiscriptadaptors UninstallAugStep z:\tswi\tbackuprestore\scripts\ini A_SP_U_NR
+
+RUN_TEST_STEP 100 tbackuprestore PRESENT z:\tswi\tbackuprestore\scripts\ini NR_SP
+
+RUN_TEST_STEP 100 tbackuprestore INSTALL z:\tswi\tbackuprestore\scripts\ini A_SP
+RUN_TEST_STEP 100 tbackuprestore PRESENT z:\tswi\tbackuprestore\scripts\ini A_SP
+
+RUN_TEST_STEP 100 tbackuprestore BACKUP z:\tswi\tbackuprestore\scripts\ini A_SP
+RUN_TEST_STEP 100 tbackuprestore PRESENT z:\tswi\tbackuprestore\scripts\ini A_SP
+
+RUN_TEST_STEP 100 tuiscriptadaptors UninstallAugStep z:\tswi\tbackuprestore\scripts\ini A_SP_U
+
+END_TESTCASE API-SEC-BACKUPNONREMOVABLE-HW-0003
+
+RUN_UTILS DeleteFile C:\Documents\abc*.txt
// Ensure that SWIS shuts down after the above tests to make sure heap checks run
RUN_TEST_STEP 5 tuiscriptadaptors SwisNotRunning
--- a/installationservices/swi/test/tbackuprestore/scripts/tbackuprestore_second_part.script Fri Mar 12 15:43:14 2010 +0200
+++ b/installationservices/swi/test/tbackuprestore/scripts/tbackuprestore_second_part.script Mon Mar 15 12:41:05 2010 +0200
@@ -35,8 +35,8 @@
START_TESTCASE API-ROM_PU_backup_restore-0001
RUN_TEST_STEP 100 tbackuprestore INSTALL z:\tswi\tbackuprestore\scripts\ini INC128848_install_pu_rom_upgrade
-RUN_TEST_STEP 100 tbackuprestore BACKUP z:\tswi\tbackuprestore\scripts\ini INC128848_rom_package
-RUN_TEST_STEP 100 tbackuprestore RESTORE z:\tswi\tbackuprestore\scripts\ini INC128848_rom_package
+RUN_TEST_STEP_RESULT -5 100 tbackuprestore BACKUP z:\tswi\tbackuprestore\scripts\ini INC128848_rom_package
+//RUN_TEST_STEP 100 tbackuprestore RESTORE z:\tswi\tbackuprestore\scripts\ini INC128848_rom_package
RUN_TEST_STEP 100 tbackuprestore PRESENT z:\tswi\tbackuprestore\scripts\ini INC128848_rom_package
END_TESTCASE API-ROM_PU_backup_restore-0001
--- a/installationservices/swi/test/tbackuprestore/scripts/tbackuprestore_second_part_post.bat Fri Mar 12 15:43:14 2010 +0200
+++ b/installationservices/swi/test/tbackuprestore/scripts/tbackuprestore_second_part_post.bat Mon Mar 15 12:41:05 2010 +0200
@@ -18,4 +18,9 @@
move /Y \epoc32\winscw\c\sys_save \epoc32\winscw\c\sys
del /s /f /q \epoc32\winscw\c\tswi\tbackuprestore\backup*.*
-del /s /f /q \epoc32\winscw\c\tswi\tbackuprestore\metadata*
\ No newline at end of file
+del /s /f /q \epoc32\winscw\c\tswi\tbackuprestore\metadata*
+del /s /f /q \epoc32\winscw\c\sys\bin\backuprestore_test_*
+del /s /f /q \epoc32\winscw\c\sys\hash\backuprestore_test_*
+del /s /f /q \epoc32\winscw\c\sys\install\scr\scr.*
+del /s /f /q \epoc32\winscw\c\sys\install\sisregistry\2baecde2\*.*
+del /s /f /q \epoc32\winscw\c\sys\install\sisregistry\2baecde2
\ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/installationservices/swi/test/testexes/packages_interpretsis_testcase/int_nr_option_01.pkg Mon Mar 15 12:41:05 2010 +0200
@@ -0,0 +1,34 @@
+;
+; Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+; All rights reserved.
+; This component and the accompanying materials are made available
+; under the terms of the License "Eclipse Public License v1.0"
+; which accompanies this distribution, and is available
+; at the URL "http://www.eclipse.org/legal/epl-v10.html".
+;
+; Initial Contributors:
+; Nokia Corporation - initial contribution.
+;
+; Contributors:
+;
+; Description:
+;
+; Install file for multi-lingual application
+; supporting two language variants.
+;
+
+; Languages -
+&EN,GE
+
+; List of localised vendor names.
+%{"Nokia Software Ltd", "Nokia Software Ltd"}
+
+; Single, non-localised (global) vendor name.
+:"Nokia Software Ltd"
+
+; Installation header.
+; Two component names as we support English and German
+#{"Interpretsis_NR_option", "Interpretsis_NR_option1"}, (0x80000086), 1,0,0, Type=SA
+
+;Ordinary file to selected drive
+"osver.txt"-"!:\Documents\abc1.txt"
\ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/installationservices/swi/test/testexes/packages_interpretsis_testcase/int_nr_option_02.pkg Mon Mar 15 12:41:05 2010 +0200
@@ -0,0 +1,34 @@
+;
+; Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+; All rights reserved.
+; This component and the accompanying materials are made available
+; under the terms of the License "Eclipse Public License v1.0"
+; which accompanies this distribution, and is available
+; at the URL "http://www.eclipse.org/legal/epl-v10.html".
+;
+; Initial Contributors:
+; Nokia Corporation - initial contribution.
+;
+; Contributors:
+;
+; Description:
+;
+; Install file for multi-lingual application
+; supporting two language variants.
+;
+
+; Languages -
+&EN,GE
+
+; List of localised vendor names.
+%{"Nokia Software Ltd", "Nokia Software Ltd"}
+
+; Single, non-localised (global) vendor name.
+:"Nokia Software Ltd"
+
+; Installation header.
+; Two component names as we support English and German
+#{"Interpretsis_NR_option3", "Interpretsis_NR_option2"}, (0x80000087), 1,0,0, Type=SA
+
+;Ordinary file to selected drive
+"osver.txt"-"!:\Documents\abc2.txt"
\ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/installationservices/swi/test/testexes/packages_interpretsis_testcase/int_nr_option_03.pkg Mon Mar 15 12:41:05 2010 +0200
@@ -0,0 +1,34 @@
+;
+; Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+; All rights reserved.
+; This component and the accompanying materials are made available
+; under the terms of the License "Eclipse Public License v1.0"
+; which accompanies this distribution, and is available
+; at the URL "http://www.eclipse.org/legal/epl-v10.html".
+;
+; Initial Contributors:
+; Nokia Corporation - initial contribution.
+;
+; Contributors:
+;
+; Description:
+;
+; Install file for multi-lingual application
+; supporting two language variants.
+;
+
+; Languages -
+&EN,GE
+
+; List of localised vendor names.
+%{"Nokia Software Ltd", "Nokia Software Ltd"}
+
+; Single, non-localised (global) vendor name.
+:"Nokia Software Ltd"
+
+; Installation header.
+; Two component names as we support English and German
+#{"Interpretsis_NR_option", "Interpretsis_NR_option1"}, (0x80000086), 1,0,0, Type=SA,RU
+
+;Ordinary file to selected drive
+"osver.txt"-"!:\Documents\abc1.txt"
\ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/installationservices/swi/test/testexes/packages_interpretsis_testcase/int_nr_option_04.pkg Mon Mar 15 12:41:05 2010 +0200
@@ -0,0 +1,34 @@
+;
+; Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+; All rights reserved.
+; This component and the accompanying materials are made available
+; under the terms of the License "Eclipse Public License v1.0"
+; which accompanies this distribution, and is available
+; at the URL "http://www.eclipse.org/legal/epl-v10.html".
+;
+; Initial Contributors:
+; Nokia Corporation - initial contribution.
+;
+; Contributors:
+;
+; Description:
+;
+; Install file for multi-lingual application
+; supporting two language variants.
+;
+
+; Languages -
+&EN,GE
+
+; List of localised vendor names.
+%{"Nokia Software Ltd", "Nokia Software Ltd"}
+
+; Single, non-localised (global) vendor name.
+:"Nokia Software Ltd"
+
+; Installation header.
+; Two component names as we support English and German
+#{"Interpretsis_NR_option", "Interpretsis_NR_option1"}, (0x80000076), 1,0,0, Type=SA,RU,NR
+
+;Ordinary file to selected drive
+"osver.txt"-"!:\Documents\abc1.txt"
\ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/installationservices/swi/test/testexes/packages_interpretsis_testcase/int_nr_option_05.pkg Mon Mar 15 12:41:05 2010 +0200
@@ -0,0 +1,34 @@
+;
+; Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+; All rights reserved.
+; This component and the accompanying materials are made available
+; under the terms of the License "Eclipse Public License v1.0"
+; which accompanies this distribution, and is available
+; at the URL "http://www.eclipse.org/legal/epl-v10.html".
+;
+; Initial Contributors:
+; Nokia Corporation - initial contribution.
+;
+; Contributors:
+;
+; Description:
+;
+; Install file for multi-lingual application
+; supporting two language variants.
+;
+
+; Languages -
+&EN,GE
+
+; List of localised vendor names.
+%{"Nokia Software Ltd", "Nokia Software Ltd"}
+
+; Single, non-localised (global) vendor name.
+:"Nokia Software Ltd"
+
+; Installation header.
+; Two component names as we support English and German
+#{"Interpretsis_NR_option", "Interpretsis_NR_option1"}, (0x80000077), 1,0,0, Type=SA,RU,NR
+
+;Ordinary file to selected drive
+"osver.txt"-"!:\Documents\abc4.txt"
\ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/installationservices/swi/test/testexes/packages_interpretsis_testcase/pu_int_nr_option_01.pkg Mon Mar 15 12:41:05 2010 +0200
@@ -0,0 +1,34 @@
+;
+; Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+; All rights reserved.
+; This component and the accompanying materials are made available
+; under the terms of the License "Eclipse Public License v1.0"
+; which accompanies this distribution, and is available
+; at the URL "http://www.eclipse.org/legal/epl-v10.html".
+;
+; Initial Contributors:
+; Nokia Corporation - initial contribution.
+;
+; Contributors:
+;
+; Description:
+;
+; Install file for multi-lingual application
+; supporting two language variants.
+;
+
+; Languages -
+&EN,GE
+
+; List of localised vendor names.
+%{"Nokia Software Ltd", "Nokia Software Ltd"}
+
+; Single, non-localised (global) vendor name.
+:"Nokia Software Ltd"
+
+; Installation header.
+; Two component names as we support English and German
+#{"Interpretsis_NR_option", "Interpretsis_NR_option1"}, (0x80000086), 1,0,0, Type=PU
+
+;Ordinary file to selected drive
+"osver.txt"-"!:\Documents\abc2.txt"
\ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/installationservices/swi/test/testexes/packages_interpretsis_testcase/sp_int_nr_option_01.pkg Mon Mar 15 12:41:05 2010 +0200
@@ -0,0 +1,34 @@
+;
+; Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+; All rights reserved.
+; This component and the accompanying materials are made available
+; under the terms of the License "Eclipse Public License v1.0"
+; which accompanies this distribution, and is available
+; at the URL "http://www.eclipse.org/legal/epl-v10.html".
+;
+; Initial Contributors:
+; Nokia Corporation - initial contribution.
+;
+; Contributors:
+;
+; Description:
+;
+; Install file for multi-lingual application
+; supporting two language variants.
+;
+
+; Languages -
+&EN,GE
+
+; List of localised vendor names.
+%{"Nokia", "Nokia"}
+
+; Single, non-localised (global) vendor name.
+:"Nokia"
+
+; Installation header.
+; Two component names as we support English and German
+#{"Interpretsis_NR_option_SP", "Interpretsis_NR_option1_SP"}, (0x80000086), 1,0,0, Type=SP
+
+;Ordinary file to selected drive
+"osver.txt"-"!:\Documents\abc3.txt"
\ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/installationservices/swi/test/testexes/packages_interpretsis_testcase/sp_int_nr_option_04.pkg Mon Mar 15 12:41:05 2010 +0200
@@ -0,0 +1,34 @@
+;
+; Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+; All rights reserved.
+; This component and the accompanying materials are made available
+; under the terms of the License "Eclipse Public License v1.0"
+; which accompanies this distribution, and is available
+; at the URL "http://www.eclipse.org/legal/epl-v10.html".
+;
+; Initial Contributors:
+; Nokia Corporation - initial contribution.
+;
+; Contributors:
+;
+; Description:
+;
+; Install file for multi-lingual application
+; supporting two language variants.
+;
+
+; Languages -
+&EN,GE
+
+; List of localised vendor names.
+%{"Nokia", "Nokia"}
+
+; Single, non-localised (global) vendor name.
+:"Nokia"
+
+; Installation header.
+; Two component names as we support English and German
+#{"Interpretsis_NR_option_SP", "Interpretsis_NR_option1_SP"}, (0x80000076), 1,0,0, Type=SP
+
+;Ordinary file to selected drive
+"osver.txt"-"!:\Documents\abc3.txt"
\ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/installationservices/swi/test/testexes/packages_interpretsis_testcase/sp_int_nr_option_06.pkg Mon Mar 15 12:41:05 2010 +0200
@@ -0,0 +1,34 @@
+;
+; Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+; All rights reserved.
+; This component and the accompanying materials are made available
+; under the terms of the License "Eclipse Public License v1.0"
+; which accompanies this distribution, and is available
+; at the URL "http://www.eclipse.org/legal/epl-v10.html".
+;
+; Initial Contributors:
+; Nokia Corporation - initial contribution.
+;
+; Contributors:
+;
+; Description:
+;
+; Install file for multi-lingual application
+; supporting two language variants.
+;
+
+; Languages -
+&EN,GE
+
+; List of localised vendor names.
+%{"Nokia", "Nokia"}
+
+; Single, non-localised (global) vendor name.
+:"Nokia"
+
+; Installation header.
+; Two component names as we support English and German
+#{"Interpretsis_NR_option_SP_NR", "Interpretsis_NR_option1_SP_NR"}, (0x80000076), 1,0,0, Type=SP,NR,RU
+
+;Ordinary file to selected drive
+"osver.txt"-"!:\Documents\abc5.txt"
\ No newline at end of file
--- a/installationservices/swi/test/testexes/prepareexes.pl Fri Mar 12 15:43:14 2010 +0200
+++ b/installationservices/swi/test/testexes/prepareexes.pl Mon Mar 15 12:41:05 2010 +0200
@@ -40,6 +40,7 @@
my $configuration = lc($ARGV[1]);
my $packagedir = "packages";
my $non_iby_packagedir = "non_iby_packages";
+my $packages_interpretsis_testcase = "packages_interpretsis_testcase";
my $builddir = "buildsis_${platform}_${configuration}";
usage() if $opt{h};
@@ -121,7 +122,7 @@
my ($file, $data) = @_;
# Ensure directory exists
- if ($file =~ basename($1) && ! -e $1) {
+ if ($1 && $file =~ basename($1) && ! -e $1) {
mkdir($1);
}
@@ -149,6 +150,8 @@
print "Processing files in directory: $builddir\n\n";
MakeSISFiles($packagedir,"yes");
MakeSISFiles($non_iby_packagedir,"no");
+MakeSISFiles($packages_interpretsis_testcase,"yes");
+
# Copy emulator version of preinstalled exes to location script expects.
# They will be moved by the test script to the e: drive.
@@ -791,6 +794,9 @@
# non-removable test
SignFileWithSpecifiedCert("nonremovablebase.sis", "nonremovablebase_sucert.sis", "tsisfile\\data\\signedsis\\sucert\\sucert.der", "tsisfile\\data\\signedsis\\sucert\\sucertkey.pem", \*iby);
+SignFileWithSpecifiedCert("int_nr_option_04.sis", "int_nr_option_04_sucert.sis", "tsisfile\\data\\signedsis\\sucert\\sucert.der", "tsisfile\\data\\signedsis\\sucert\\sucertkey.pem", \*iby);
+SignFileWithSpecifiedCert("int_nr_option_05.sis", "int_nr_option_05_sucert.sis", "tsisfile\\data\\signedsis\\sucert\\sucert.der", "tsisfile\\data\\signedsis\\sucert\\sucertkey.pem", \*iby);
+SignFileWithSpecifiedCert("sp_int_nr_option_06.sis", "sp_int_nr_option_06_sucert.sis", "tsisfile\\data\\signedsis\\sucert\\sucert.der", "tsisfile\\data\\signedsis\\sucert\\sucertkey.pem", \*iby);
SignFile("romupgrademorecapsthansucert_sucert.sis", "romupgrademorecapsthansucert_sucert_root5.sis", "root5ca", \*iby);
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/installationservices/swi/test/tsisfile/data/dependentonsample.pkg Mon Mar 15 12:41:05 2010 +0200
@@ -0,0 +1,29 @@
+;
+; Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+; All rights reserved.
+; This component and the accompanying materials are made available
+; under the terms of the License "Eclipse Public License v1.0"
+; which accompanies this distribution, and is available
+; at the URL "http://www.eclipse.org/legal/epl-v10.html".
+;
+; Initial Contributors:
+; Nokia Corporation - initial contribution.
+;
+; Contributors:
+;
+; Description:
+;
+; This test file tests dependencies. It is the base package which is upgraded in the tests.
+
+;Languages
+&EN
+
+;Header
+#{"dependentonsample"}, (0x88001110), 1, 2, 3,TYPE=SA
+
+%{"Vendor"}
+:"Unique Vendor Name"
+
+(0x80000001), 4, 5, 6, {"Simple"}
+
+"files\option1.txt"-"!:\Documents\InstTest\dependentonsample.txt";
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/installationservices/swi/test/tsisfile/data/embedspsainsp.pkg Mon Mar 15 12:41:05 2010 +0200
@@ -0,0 +1,29 @@
+;
+; Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+; All rights reserved.
+; This component and the accompanying materials are made available
+; under the terms of the License "Eclipse Public License v1.0"
+; which accompanies this distribution, and is available
+; at the URL "http://www.eclipse.org/legal/epl-v10.html".
+;
+; Initial Contributors:
+; Nokia Corporation - initial contribution.
+;
+; Contributors:
+;
+; Description:
+;
+&EN
+
+; This SIS file simply SA upgrades its twin in testexes that embeds a ROM upgrade.
+; This SIS file has no embedded packages.
+
+#{"embed ROM exe eclipse SP to embed SA"}, (0x802730A5), 2, 2, 5, TYPE=SP
+%{"Crypto Services"}
+:"Crypto Services"
+
+@"embedspsa.sis", (0x802730A5)
+
+"embedspsa.pkg"-"c:\embed\sourcesa.pkg"
+
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/installationservices/swi/test/tsisfile/data/filebapu.pkg Mon Mar 15 12:41:05 2010 +0200
@@ -0,0 +1,23 @@
+;
+; Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+; All rights reserved.
+; This component and the accompanying materials are made available
+; under the terms of the License "Eclipse Public License v1.0"
+; which accompanies this distribution, and is available
+; at the URL "http://www.eclipse.org/legal/epl-v10.html".
+;
+; Initial Contributors:
+; Nokia Corporation - initial contribution.
+;
+; Contributors:
+;
+; Description:
+;
+
+&EN
+
+#{"File Base Package"}, (0xA0000A93), 1, 3, 5, TYPE=PU
+:"Crypto Services"
+%{"Crypto Services"}
+
+; Delivers no files. Just a test base package.
\ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/installationservices/swi/test/tsisfile/data/filesp4.pkg Mon Mar 15 12:41:05 2010 +0200
@@ -0,0 +1,31 @@
+;
+; Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+; All rights reserved.
+; This component and the accompanying materials are made available
+; under the terms of the License "Eclipse Public License v1.0"
+; which accompanies this distribution, and is available
+; at the URL "http://www.eclipse.org/legal/epl-v10.html".
+;
+; Initial Contributors:
+; Nokia Corporation - initial contribution.
+;
+; Contributors:
+;
+; Description:
+;
+&EN
+
+; This SIS file simply SA upgrades its twin in testexes that embeds a ROM upgrade.
+; This SIS file has no embedded packages.
+
+#{"embed ROM exe eclipse SP to embed SA"}, (0x88001112), 2, 2, 5, TYPE=SA
+%{"Crypto Services dummy"}
+:"Crypto Services dummy"
+
+@"filebapu.sis", (0xA0000A93)
+@"filesp2.sis", (0xA0000A93)
+
+
+
+
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/installationservices/swi/test/tsisfile/data/uembed18uid.pkg Mon Mar 15 12:41:05 2010 +0200
@@ -0,0 +1,35 @@
+;
+; Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+; All rights reserved.
+; This component and the accompanying materials are made available
+; under the terms of the License "Eclipse Public License v1.0"
+; which accompanies this distribution, and is available
+; at the URL "http://www.eclipse.org/legal/epl-v10.html".
+;
+; Initial Contributors:
+; Nokia Corporation - initial contribution.
+;
+; Contributors:
+;
+; Description:
+;
+; A SISX file, with 3 embedded SISX files
+
+;Languages
+&EN
+
+;Header
+#{"embed 16 uids"}, (0x88001113), 1, 2, 3
+
+%{"Vendor"}
+:"Unique Vendor Name"
+
+;Embedded component
+@"testdependencies_embeddedinsis4.sis",(0x811118FF)
+@"devlangsup_embedded.sis",(0x88000102)
+@"testembed2lvl.sis",(0x8000001C)
+@"3datafiles.sis",(0xA0000206)
+@"053177c_6.sis",(0x81115016)
+
+;Ordinary file to selected drive
+"text\cpu.txt"-"!:\Documents\def053177\cpu1.txt"
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/installationservices/swi/test/tsisfile/data/umultilevelembed.pkg Mon Mar 15 12:41:05 2010 +0200
@@ -0,0 +1,30 @@
+;
+; Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+; All rights reserved.
+; This component and the accompanying materials are made available
+; under the terms of the License "Eclipse Public License v1.0"
+; which accompanies this distribution, and is available
+; at the URL "http://www.eclipse.org/legal/epl-v10.html".
+;
+; Initial Contributors:
+; Nokia Corporation - initial contribution.
+;
+; Contributors:
+;
+; Description:
+;
+&EN
+
+; This SIS file simply SA upgrades its twin in testexes that embeds a ROM upgrade.
+; This SIS file has no embedded packages.
+
+#{"it embeds 2 pkg and they embed 2 pkg each "}, (0x88001111), 1, 1, 1, TYPE=SA
+%{"Crypto Services"}
+:"Crypto Services"
+
+@"testdependencies_embeddedinsis4.sis",(0x811118FF)
+@"053177c_6.sis",(0x81115016)
+
+"embedspsa.pkg"-"c:\embed\sourcesa.pkg"
+
+
--- a/installationservices/swi/test/tuiscriptadaptors/scripts/testdevicelanguages.ini Fri Mar 12 15:43:14 2010 +0200
+++ b/installationservices/swi/test/tuiscriptadaptors/scripts/testdevicelanguages.ini Mon Mar 15 12:41:05 2010 +0200
@@ -1043,3 +1043,150 @@
[langauge_to_german]
language=03
+
+[defineProperty]
+DefineProperty=true
+
+[API-INST-PAS-SWI-0001]
+sis=z:\tswi\tsis\data\equivalent_language_sa.sis
+script=z:\tswi\tuiscriptadaptors\scripts\simple.xml
+PublishedUidCount=1
+PublishedUidValue0=88000108
+
+[API-INST-PAS-SWI-0001-A]
+sis=z:\tswi\tsis\data\equivalent_language_sp.sis
+script=z:\tswi\tuiscriptadaptors\scripts\simple.xml
+PublishedUidCount=1
+PublishedUidValue0=88000108
+
+[API-INST-PAS-SWI-0001-Uninstall]
+uid=88000108
+script=z:\tswi\tuiscriptadaptors\scripts\uninstall.xml
+
+[API-INST-PAS-SWI-0001-Uninstall-A]
+uid=88000108
+vendorName=Vendor
+packageName=Equivalent_SP_EN
+script=z:\tswi\tuiscriptadaptors\scripts\uninstall.xml
+
+[API-INST-PAS-SWI-0002]
+sis=z:\tswi\tsis\data\embedspsainsp.sis
+script=z:\tswi\tuiscriptadaptors\scripts\simple.xml
+PublishedUidCount=1
+PublishedUidValue0=802730A5
+
+[API-INST-PAS-SWI-0002-Uninstall]
+uid=802730A5
+script=z:\tswi\tuiscriptadaptors\scripts\uninstall.xml
+
+[API-INST-PAS-SWI-0003]
+sis=z:\tswi\tsis\data\053177c_7.sis
+script=z:\tswi\tuiscriptadaptors\scripts\simple.xml
+PublishedUidCount=8
+PublishedUidValue0=81115017
+PublishedUidValue1=81115016
+PublishedUidValue2=81115015
+PublishedUidValue3=81115014
+PublishedUidValue4=81115013
+PublishedUidValue5=81115012
+PublishedUidValue6=81115011
+PublishedUidValue7=81115000
+
+[API-INST-PAS-SWI-0003-Uninstall]
+uid=81115017
+script=z:\tswi\tuiscriptadaptors\scripts\uninstall.xml
+
+[API-INST-PAS-SWI-0004]
+sis=z:\tswi\tsis\data\testembed1lvl.sis
+script=z:\tswi\tuiscriptadaptors\scripts\simple.xml
+PublishedUidCount=1
+PublishedUidValue0=8000001B
+
+[API-INST-PAS-SWI-0004-A]
+sis=z:\tswi\tsis\data\dependentonsample.sis
+script=z:\tswi\tuiscriptadaptors\scripts\simple.xml
+PublishedUidCount=2
+PublishedUidValue0=88001110
+PublishedUidValue1=80000001
+
+[API-INST-PAS-SWI-0004-Uninstall-A]
+uid=8000001B
+script=z:\tswi\tuiscriptadaptors\scripts\uninstall.xml
+
+[API-INST-PAS-SWI-0004-Uninstall-B]
+uid=88001110
+script=z:\tswi\tuiscriptadaptors\scripts\uninstall.xml
+
+
+
+[API-INST-PAS-SWI-0005]
+sis=z:\tswi\tsis\data\umultilevelembed.sis
+script=z:\tswi\tuiscriptadaptors\scripts\simple.xml
+PublishedUidCount=11
+PublishedUidValue0=88001111
+PublishedUidValue1=811118FF
+PublishedUidValue2=81115016
+PublishedUidValue3=811111FE
+PublishedUidValue4=811111FF
+PublishedUidValue5=81115015
+PublishedUidValue6=81115014
+PublishedUidValue7=81115013
+PublishedUidValue8=81115012
+PublishedUidValue9=81115011
+PublishedUidValue10=81115000
+
+[API-INST-PAS-SWI-0005-Uninstall]
+uid=88001111
+script=z:\tswi\tuiscriptadaptors\scripts\uninstall.xml
+
+
+[API-INST-PAS-SWI-0006]
+sis=z:\tswi\tsis\data\filebase.sis
+script=z:\tswi\tuiscriptadaptors\scripts\simple.xml
+PublishedUidCount=1
+PublishedUidValue0=A0000A93
+
+[API-INST-PAS-SWI-0006]
+sis=z:\tswi\tsis\data\filebase.sis
+script=z:\tswi\tuiscriptadaptors\scripts\simple.xml
+PublishedUidCount=1
+PublishedUidValue0=A0000A93
+
+[API-INST-PAS-SWI-0006-A]
+sis=z:\tswi\tsis\data\filesp4.sis
+script=z:\tswi\tuiscriptadaptors\scripts\simple.xml
+PublishedUidCount=2
+PublishedUidValue0=88001112
+PublishedUidValue1=A0000A93
+
+
+[API-INST-PAS-SWI-0006-Uninstall]
+uid=88001112
+script=z:\tswi\tuiscriptadaptors\scripts\uninstall.xml
+
+[API-INST-PAS-SWI-0007]
+sis=z:\tswi\tsis\data\uembed18uid.sis
+script=z:\tswi\tuiscriptadaptors\scripts\simple.xml
+PublishedUidCount=18
+PublishedUidValue0=88001113
+PublishedUidValue1=811118FF
+PublishedUidValue2=88000102
+PublishedUidValue3=8000001C
+PublishedUidValue4=A0000206
+PublishedUidValue5=81115016
+PublishedUidValue6=811111FE
+PublishedUidValue7=811111FF
+PublishedUidValue8=88000101
+PublishedUidValue9=8000001B
+PublishedUidValue10=80000002
+PublishedUidValue11=81115015
+PublishedUidValue12=80000001
+PublishedUidValue13=81115014
+PublishedUidValue14=81115013
+PublishedUidValue15=81115012
+PublishedUidValue16=81115011
+PublishedUidValue17=81115000
+
+[API-INST-PAS-SWI-0007-Uninstall]
+uid=88001113
+script=z:\tswi\tuiscriptadaptors\scripts\uninstall.xml
--- a/installationservices/swi/test/tuiscriptadaptors/scripts/testdevicelanguages.script Fri Mar 12 15:43:14 2010 +0200
+++ b/installationservices/swi/test/tuiscriptadaptors/scripts/testdevicelanguages.script Mon Mar 15 12:41:05 2010 +0200
@@ -1,5 +1,5 @@
//
-// Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2009-2010 Nokia Corporation and/or its subsidiary(-ies).
// All rights reserved.
// This component and the accompanying materials are made available
// under the terms of the License "Eclipse Public License v1.0"
@@ -605,3 +605,108 @@
// Negative test to verify -ve language passed will not cause any crash
RUN_TEST_STEP !Error=-3 100 tuiscriptadaptors InstallAsyncStep z:\tswi\tuiscriptadaptors\scripts\testdevicelanguages.ini pass_negative_language_id
END_TESTCASE API-INST-PREQ2525-SWI-0010
+
+
+//! @SYMTestCaseID API-INST-PAS-SWI-0001
+//! @SYMTestCaseDesc Install SA package , check for published uid , Install SP , check for published uid
+
+START_TESTCASE API-INST-PAS-SWI-0001
+
+RUN_TEST_STEP 100 tuiscriptadaptors GetPublishedUidArrayStep z:\tswi\tuiscriptadaptors\scripts\testdevicelanguages.ini defineProperty
+RUN_TEST_STEP 100 tuiscriptadaptors InstallAsyncStep z:\tswi\tuiscriptadaptors\scripts\testdevicelanguages.ini API-INST-PAS-SWI-0001
+RUN_TEST_STEP 100 tuiscriptadaptors GetPublishedUidArrayStep z:\tswi\tuiscriptadaptors\scripts\testdevicelanguages.ini API-INST-PAS-SWI-0001
+RUN_TEST_STEP 100 tuiscriptadaptors GetPublishedUidArrayStep z:\tswi\tuiscriptadaptors\scripts\testdevicelanguages.ini defineProperty
+RUN_TEST_STEP 100 tuiscriptadaptors InstallAsyncStep z:\tswi\tuiscriptadaptors\scripts\testdevicelanguages.ini API-INST-PAS-SWI-0001-A
+RUN_TEST_STEP 100 tuiscriptadaptors GetPublishedUidArrayStep z:\tswi\tuiscriptadaptors\scripts\testdevicelanguages.ini API-INST-PAS-SWI-0001-A
+RUN_TEST_STEP 100 tuiscriptadaptors GetPublishedUidArrayStep z:\tswi\tuiscriptadaptors\scripts\testdevicelanguages.ini defineProperty
+RUN_TEST_STEP 100 tuiscriptadaptors UninstallAugStep z:\tswi\tuiscriptadaptors\scripts\testdevicelanguages.ini API-INST-PAS-SWI-0001-Uninstall-A
+RUN_TEST_STEP 100 tuiscriptadaptors GetPublishedUidArrayStep z:\tswi\tuiscriptadaptors\scripts\testdevicelanguages.ini API-INST-PAS-SWI-0001
+RUN_TEST_STEP 100 tuiscriptadaptors InstallAsyncStep z:\tswi\tuiscriptadaptors\scripts\testdevicelanguages.ini API-INST-PAS-SWI-0001-A
+RUN_TEST_STEP 100 tuiscriptadaptors GetPublishedUidArrayStep z:\tswi\tuiscriptadaptors\scripts\testdevicelanguages.ini defineProperty
+RUN_TEST_STEP 100 tuiscriptadaptors UninstallAsyncStep z:\tswi\tuiscriptadaptors\scripts\testdevicelanguages.ini API-INST-PAS-SWI-0001-Uninstall
+RUN_TEST_STEP 100 tuiscriptadaptors GetPublishedUidArrayStep z:\tswi\tuiscriptadaptors\scripts\testdevicelanguages.ini API-INST-PAS-SWI-0001
+
+END_TESTCASE API-INST-PAS-SWI-0001
+
+//! @SYMTestCaseID API-INST-PAS-SWI-0002
+//! @SYMTestCaseDesc Install SA embedding SP package , check for published uid
+
+//START_TESTCASE API-INST-PAS-SWI-0002
+
+//RUN_TEST_STEP 100 tuiscriptadaptors GetPublishedUidArrayStep z:\tswi\tuiscriptadaptors\scripts\testdevicelanguages.ini defineProperty
+//RUN_TEST_STEP 100 tuiscriptadaptors InstallAsyncStep z:\tswi\tuiscriptadaptors\scripts\testdevicelanguages.ini API-INST-PAS-SWI-0002
+//RUN_TEST_STEP 100 tuiscriptadaptors GetPublishedUidArrayStep z:\tswi\tuiscriptadaptors\scripts\testdevicelanguages.ini API-INST-PAS-SWI-0002
+//RUN_TEST_STEP 100 tuiscriptadaptors UninstallAsyncStep z:\tswi\tuiscriptadaptors\scripts\testdevicelanguages.ini API-INST-PAS-SWI-0002-Uninstall
+//END_TESTCASE API-INST-PAS-SWI-0002
+
+//! @SYMTestCaseID API-INST-PAS-SWI-0003
+//! @SYMTestCaseDesc Install 8 level of embeded package , check for published uid
+
+START_TESTCASE API-INST-PAS-SWI-0003
+
+RUN_TEST_STEP 100 tuiscriptadaptors GetPublishedUidArrayStep z:\tswi\tuiscriptadaptors\scripts\testdevicelanguages.ini defineProperty
+RUN_TEST_STEP 100 tuiscriptadaptors InstallAsyncStep z:\tswi\tuiscriptadaptors\scripts\testdevicelanguages.ini API-INST-PAS-SWI-0003
+RUN_TEST_STEP 100 tuiscriptadaptors GetPublishedUidArrayStep z:\tswi\tuiscriptadaptors\scripts\testdevicelanguages.ini API-INST-PAS-SWI-0003
+RUN_TEST_STEP 100 tuiscriptadaptors GetPublishedUidArrayStep z:\tswi\tuiscriptadaptors\scripts\testdevicelanguages.ini defineProperty
+RUN_TEST_STEP 100 tuiscriptadaptors UninstallAsyncStep z:\tswi\tuiscriptadaptors\scripts\testdevicelanguages.ini API-INST-PAS-SWI-0003-Uninstall
+RUN_TEST_STEP 100 tuiscriptadaptors GetPublishedUidArrayStep z:\tswi\tuiscriptadaptors\scripts\testdevicelanguages.ini API-INST-PAS-SWI-0003
+END_TESTCASE API-INST-PAS-SWI-0003
+
+
+//! @SYMTestCaseID API-INST-PAS-SWI-0004
+//! @SYMTestCaseDesc Install 3 packages A,B and C . B depends on A and C embed A , uninstall C and check for published uid RemoveOnlyWithLastDependent = true
+
+START_TESTCASE API-INST-PAS-SWI-0004
+
+
+RUN_TEST_STEP 100 tuiscriptadaptors InstallAsyncStep z:\tswi\tuiscriptadaptors\scripts\testdevicelanguages.ini API-INST-PAS-SWI-0004
+RUN_TEST_STEP 100 tuiscriptadaptors InstallAsyncStep z:\tswi\tuiscriptadaptors\scripts\testdevicelanguages.ini API-INST-PAS-SWI-0004-A
+RUN_TEST_STEP 100 tuiscriptadaptors GetPublishedUidArrayStep z:\tswi\tuiscriptadaptors\scripts\testdevicelanguages.ini defineProperty
+RUN_TEST_STEP 100 tuiscriptadaptors UninstallAsyncStep z:\tswi\tuiscriptadaptors\scripts\testdevicelanguages.ini API-INST-PAS-SWI-0004-Uninstall-A
+RUN_TEST_STEP 100 tuiscriptadaptors GetPublishedUidArrayStep z:\tswi\tuiscriptadaptors\scripts\testdevicelanguages.ini API-INST-PAS-SWI-0004
+RUN_TEST_STEP 100 tuiscriptadaptors GetPublishedUidArrayStep z:\tswi\tuiscriptadaptors\scripts\testdevicelanguages.ini defineProperty
+RUN_TEST_STEP 100 tuiscriptadaptors UninstallAsyncStep z:\tswi\tuiscriptadaptors\scripts\testdevicelanguages.ini API-INST-PAS-SWI-0004-Uninstall-B
+RUN_TEST_STEP 100 tuiscriptadaptors GetPublishedUidArrayStep z:\tswi\tuiscriptadaptors\scripts\testdevicelanguages.ini API-INST-PAS-SWI-0004-A
+END_TESTCASE API-INST-PAS-SWI-0004
+
+
+//! @SYMTestCaseID API-INST-PAS-SWI-0005
+//! @SYMTestCaseDesc Install mutli level dependency , Install A which embeds B and C , Both B and C further embeds xyz....
+
+START_TESTCASE API-INST-PAS-SWI-0005
+
+RUN_TEST_STEP 100 tuiscriptadaptors GetPublishedUidArrayStep z:\tswi\tuiscriptadaptors\scripts\testdevicelanguages.ini defineProperty
+RUN_TEST_STEP 100 tuiscriptadaptors InstallAsyncStep z:\tswi\tuiscriptadaptors\scripts\testdevicelanguages.ini API-INST-PAS-SWI-0005
+RUN_TEST_STEP 100 tuiscriptadaptors GetPublishedUidArrayStep z:\tswi\tuiscriptadaptors\scripts\testdevicelanguages.ini API-INST-PAS-SWI-0005
+RUN_TEST_STEP 100 tuiscriptadaptors GetPublishedUidArrayStep z:\tswi\tuiscriptadaptors\scripts\testdevicelanguages.ini defineProperty
+RUN_TEST_STEP 100 tuiscriptadaptors UninstallAsyncStep z:\tswi\tuiscriptadaptors\scripts\testdevicelanguages.ini API-INST-PAS-SWI-0005-Uninstall
+RUN_TEST_STEP 100 tuiscriptadaptors GetPublishedUidArrayStep z:\tswi\tuiscriptadaptors\scripts\testdevicelanguages.ini API-INST-PAS-SWI-0005
+END_TESTCASE API-INST-PAS-SWI-0005
+
+
+//! @SYMTestCaseID API-INST-PAS-SWI-0006
+//! @SYMTestCaseDesc Install SA , install another SA which embeds a PU and SP of first SA
+
+START_TESTCASE API-INST-PAS-SWI-0006
+RUN_TEST_STEP 100 tuiscriptadaptors InstallAsyncStep z:\tswi\tuiscriptadaptors\scripts\testdevicelanguages.ini API-INST-PAS-SWI-0006
+RUN_TEST_STEP 100 tuiscriptadaptors GetPublishedUidArrayStep z:\tswi\tuiscriptadaptors\scripts\testdevicelanguages.ini defineProperty
+RUN_TEST_STEP 100 tuiscriptadaptors InstallAsyncStep z:\tswi\tuiscriptadaptors\scripts\testdevicelanguages.ini API-INST-PAS-SWI-0006-A
+RUN_TEST_STEP 100 tuiscriptadaptors GetPublishedUidArrayStep z:\tswi\tuiscriptadaptors\scripts\testdevicelanguages.ini API-INST-PAS-SWI-0006-A
+RUN_TEST_STEP 100 tuiscriptadaptors GetPublishedUidArrayStep z:\tswi\tuiscriptadaptors\scripts\testdevicelanguages.ini defineProperty
+RUN_TEST_STEP 100 tuiscriptadaptors UninstallAsyncStep z:\tswi\tuiscriptadaptors\scripts\testdevicelanguages.ini API-INST-PAS-SWI-0006-Uninstall
+RUN_TEST_STEP 100 tuiscriptadaptors GetPublishedUidArrayStep z:\tswi\tuiscriptadaptors\scripts\testdevicelanguages.ini API-INST-PAS-SWI-0006-A
+END_TESTCASE API-INST-PAS-SWI-0006
+
+
+//! @SYMTestCaseID API-INST-PAS-SWI-0007
+//! @SYMTestCaseDesc Install sis file which embeds 17 sis file in it , Negative test to hit buffer overflow condition in secutils.dll
+
+START_TESTCASE API-INST-PAS-SWI-0007
+RUN_TEST_STEP 100 tuiscriptadaptors GetPublishedUidArrayStep z:\tswi\tuiscriptadaptors\scripts\testdevicelanguages.ini defineProperty
+RUN_TEST_STEP 100 tuiscriptadaptors InstallAsyncStep z:\tswi\tuiscriptadaptors\scripts\testdevicelanguages.ini API-INST-PAS-SWI-0007
+RUN_TEST_STEP !Result=Fail 100 tuiscriptadaptors GetPublishedUidArrayStep z:\tswi\tuiscriptadaptors\scripts\testdevicelanguages.ini API-INST-PAS-SWI-0007
+RUN_TEST_STEP 100 tuiscriptadaptors GetPublishedUidArrayStep z:\tswi\tuiscriptadaptors\scripts\testdevicelanguages.ini defineProperty
+RUN_TEST_STEP 100 tuiscriptadaptors UninstallAsyncStep z:\tswi\tuiscriptadaptors\scripts\testdevicelanguages.ini API-INST-PAS-SWI-0007-Uninstall
+RUN_TEST_STEP !Result=Fail 100 tuiscriptadaptors GetPublishedUidArrayStep z:\tswi\tuiscriptadaptors\scripts\testdevicelanguages.ini API-INST-PAS-SWI-0007
+END_TESTCASE API-INST-PAS-SWI-0007
+
--- a/installationservices/swi/test/tuiscriptadaptors/tswisserver.cpp Fri Mar 12 15:43:14 2010 +0200
+++ b/installationservices/swi/test/tuiscriptadaptors/tswisserver.cpp Mon Mar 15 12:41:05 2010 +0200
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2004-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2004-2010 Nokia Corporation and/or its subsidiary(-ies).
* All rights reserved.
* This component and the accompanying materials are made available
* under the terms of the License "Eclipse Public License v1.0"
@@ -233,6 +233,8 @@
testStep = new CSwisUninstallPkgsStep(CSwisUninstallPkgsStep::ERemovePkgs);
else if (aStepName == KSwisGetPackageDetails) // Get Package Details
testStep = new CSwisUninstallPkgsStep(CSwisUninstallPkgsStep::EPkgDetails);
+ else if (aStepName == KSwisGetPublishedUidArrayStep) // Get Published Package Uid's Array
+ testStep = new CSwisCheckPublishUidStep();
#ifdef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK
else if (aStepName == KCheckSCRFieldStep) // Check the SCR components' 'Origin Verified', 'Known Revoked', 'DRM Ptotected' field values.
testStep = new CCheckScrFieldStep();
--- a/installationservices/swi/test/tuiscriptadaptors/tswisstep.cpp Fri Mar 12 15:43:14 2010 +0200
+++ b/installationservices/swi/test/tuiscriptadaptors/tswisstep.cpp Mon Mar 15 12:41:05 2010 +0200
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2004-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2004-2010 Nokia Corporation and/or its subsidiary(-ies).
* All rights reserved.
* This component and the accompanying materials are made available
* under the terms of the License "Eclipse Public License v1.0"
@@ -40,6 +40,7 @@
#include "pkgremover.h"
#include "pkgremovererrors.h"
#include "sisregistryaccess_client.h"
+#include <swi/swiutils.h>
#ifdef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK
#include <usif/scr/scr.h>
@@ -2629,6 +2630,139 @@
return TestStepResult();
}
+
+//
+// CSwisCheckPublishUidStep
+//
+
+CSwisCheckPublishUidStep::CSwisCheckPublishUidStep()
+ {
+ // Call base class method to set up the human readable name for logging
+ SetTestStepName(KSwisGetPublishedUidArrayStep);
+ }
+
+/**
+ * Override of base class virtual. Prepares for the test run of SWIS
+ * @return TVerdict code
+ */
+TVerdict CSwisCheckPublishUidStep::doTestStepPreambleL()
+ {
+ INFO_PRINTF1(_L("CSwisCheckPublishUidStep::doTestStepPreambleL"));
+ _LIT(KDefineProperty, "DefineProperty");
+ iJustDefineProperty=EFalse;
+ if (GetBoolFromConfig(ConfigSection(),KDefineProperty,iJustDefineProperty) )
+ {
+ if(iJustDefineProperty)
+ {
+ INFO_PRINTF1(_L("CSwisCheckPublishUidStep is running in define Mode..just define the property"));
+ return TestStepResult();
+ }
+ }
+
+ _LIT(KPublishedUidCount, "PublishedUidCount");
+ _LIT(KPublishedUidValue, "PublishedUidValue");
+ TInt expectedUidCount;
+ TBuf<20> publishedUidParam;
+
+ if (!GetIntFromConfig(ConfigSection(),KPublishedUidCount,expectedUidCount))
+ {
+ ERR_PRINTF1(_L("No uid mentioned in .ini"));
+ return TestStepResult();
+ }
+
+ iExpectedUidList[0].iUid = expectedUidCount;
+ if(expectedUidCount>=KTestMaxUidCount-1)
+ {
+ ERR_PRINTF1(_L("The buffer available holds upto 15 Uids"));
+ return TestStepResult();
+ }
+
+ for (TInt i=0; i<iExpectedUidList[0].iUid; i++)
+ {
+ TInt uid;
+ publishedUidParam = KPublishedUidValue;
+ GenerateIndexedAttributeNameL(publishedUidParam, i);
+ if (!GetHexFromConfig(ConfigSection(), publishedUidParam, uid))
+ {
+ ERR_PRINTF1(_L("Missing uid"));
+ continue;
+ }
+ TUid pkgUid;
+ pkgUid.iUid=uid;
+ iExpectedUidList[i+1]= pkgUid;
+ }
+ return TestStepResult();
+ }
+
+void CSwisCheckPublishUidStep::GenerateIndexedAttributeNameL(TDes& aInitialAttributeName, TInt aIndex)
+ {
+ const TInt MAX_INT_STR_LEN = 8;
+ TBuf<MAX_INT_STR_LEN> integerAppendStr;
+ integerAppendStr.Format(_L("%d"), aIndex);
+ aInitialAttributeName.Append(integerAppendStr);
+ }
+
+
+TVerdict CSwisCheckPublishUidStep::doTestStepL()
+ {
+ INFO_PRINTF1(KSwisGetPublishedUidArrayStep);
+ TInt err=0;
+ if(iJustDefineProperty)
+ {
+ err = RProperty::Define(KUidSystemCategory, KSWIUidsCurrentlyBeingProcessed, RProperty::EByteArray);
+ if (err != KErrNone && err != KErrAlreadyExists)
+ User::Leave(err);
+ return TestStepResult();
+ }
+
+ TUid expUid;
+ TInt expCount;
+ RArray<TUid> retrivedUidList;
+ CleanupClosePushL(retrivedUidList);
+ expCount=iExpectedUidList[0].iUid;
+ if(KErrNone!=GetAllUids(retrivedUidList))
+ {
+ ERR_PRINTF1(_L("Failed to read all uids "));
+ SetTestStepResult(EFail);
+ CleanupStack::PopAndDestroy(&retrivedUidList);
+ return TestStepResult();
+ }
+ if (expCount!=retrivedUidList.Count())
+ {
+ ERR_PRINTF3(_L("expected and read count is not same , expected count is %d read count is %d"),expCount, retrivedUidList.Count());
+ SetTestStepResult(EFail);
+ CleanupStack::PopAndDestroy(&retrivedUidList);
+ return TestStepResult();
+ }
+ for(TInt i=0;i<expCount;i++)
+ {
+ expUid=iExpectedUidList[i+1];
+ INFO_PRINTF2(_L("Expected package uid %x"), expUid.iUid);
+ if (retrivedUidList.Find(expUid)==KErrNotFound)
+ {
+ ERR_PRINTF3(_L("Expected uid %x is not found and return code for retrivedUidList.Find is %d "), expUid.iUid,err);
+ SetTestStepResult(EFail);
+ }
+ }
+ CleanupStack::PopAndDestroy(&retrivedUidList);
+ return TestStepResult();
+ }
+
+TVerdict CSwisCheckPublishUidStep::doTestStepPostambleL()
+ {
+ if(!iJustDefineProperty)
+ {
+ TInt err = RProperty::Delete(KUidSystemCategory,KSWIUidsCurrentlyBeingProcessed);
+ if(err != KErrNone)
+ {
+ ERR_PRINTF1(_L("Not able to delete property "));
+ }
+ return TestStepResult();
+ }
+
+ return TestStepResult();
+ }
+
#ifdef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK
/**
* Override of base class pure virtual
--- a/installationservices/swi/test/tuiscriptadaptors/tswisstep.h Fri Mar 12 15:43:14 2010 +0200
+++ b/installationservices/swi/test/tuiscriptadaptors/tswisstep.h Mon Mar 15 12:41:05 2010 +0200
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2004-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2004-2010 Nokia Corporation and/or its subsidiary(-ies).
* All rights reserved.
* This component and the accompanying materials are made available
* under the terms of the License "Eclipse Public License v1.0"
@@ -369,6 +369,7 @@
_LIT(KSwisListUninstallPkgsStep, "ListUninstallPkgsStep");
_LIT(KSwisRemoveUninstallPkgsStep, "RemoveUninstallPkgsStep");
_LIT(KSwisGetPackageDetails, "GetPackageDetails");
+_LIT(KSwisGetPublishedUidArrayStep, "GetPublishedUidArrayStep");
#ifdef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK
_LIT(KCheckSCRFieldStep, "CheckSCRFieldStep");
_LIT(KCheckSCRCompPropertyStep, "CheckSCRCompPropertyStep");
@@ -490,4 +491,26 @@
#endif
};
+/**
+ * Check Published Uid test step class
+ * @test
+ * @internalComponent
+ */
+const TInt KTestMaxUidCount=20; //One more than the maximum number of Uids that the array, publishing the Uids, holds
+class CSwisCheckPublishUidStep : public CSwisTestStep
+ {
+public:
+ CSwisCheckPublishUidStep();
+ virtual TVerdict doTestStepPreambleL();
+ virtual TVerdict doTestStepPostambleL();
+ virtual TVerdict doTestStepL();
+
+private:
+ void GenerateIndexedAttributeNameL(TDes& aInitialAttributeName, TInt aIndex);
+
+private:
+TUid iExpectedUidList[KTestMaxUidCount]; //An array whose first element holds the number of uids in the subsequent indices of the array, followed by the the list of uids that are being published.
+TBool iJustDefineProperty;
+ };
+
#endif // __TSWISSTEP_H__
--- a/installationservices/swi/test/tuiscriptadaptors/tuiscriptadaptors.mmh Fri Mar 12 15:43:14 2010 +0200
+++ b/installationservices/swi/test/tuiscriptadaptors/tuiscriptadaptors.mmh Mon Mar 15 12:41:05 2010 +0200
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2008-2010 Nokia Corporation and/or its subsidiary(-ies).
* All rights reserved.
* This component and the accompanying materials are made available
* under the terms of the License "Eclipse Public License v1.0"
@@ -60,6 +60,7 @@
library charconv.lib
library pkgremover.lib
library inetprotutil.lib
+library swiutils.lib
#ifdef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK
LIBRARY scrclient.lib
#endif
--- a/ncdengine/engine/group/catalogsdebug.mmp Fri Mar 12 15:43:14 2010 +0200
+++ b/ncdengine/engine/group/catalogsdebug.mmp Mon Mar 15 12:41:05 2010 +0200
@@ -51,7 +51,7 @@
SOURCEPATH ../../engine/src
SOURCE catalogsdebug.cpp
#ifndef WINSCW
-SOURCE stackpointer.s
+SOURCE stackpointer.cia
#endif
// System include paths
--- a/ncdengine/engine/src/catalogsdebug.cpp Fri Mar 12 15:43:14 2010 +0200
+++ b/ncdengine/engine/src/catalogsdebug.cpp Mon Mar 15 12:41:05 2010 +0200
@@ -49,7 +49,7 @@
#include "e32debug.h"
#ifndef __WINS__
-extern "C" TUint32 GetStackPointer();
+extern TUint32 GetStackPointer();
#endif
//#define _DDPRINT( x ) RDebug::Printf x
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/ncdengine/engine/src/stackpointer.cia Mon Mar 15 12:41:05 2010 +0200
@@ -0,0 +1,24 @@
+/*
+* Copyright (c) 2010 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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+#include <e32def.h>
+
+__NAKED__ TUint32 GetStackPointer(void)
+ {
+ asm("mov r0,sp");
+ asm("bx lr");
+ }
+
--- a/ncdengine/group/bld.inf Fri Mar 12 15:43:14 2010 +0200
+++ b/ncdengine/group/bld.inf Mon Mar 15 12:41:05 2010 +0200
@@ -41,7 +41,7 @@
// This allows eclipsing the ROM base installation with normal SIS
//****************************************************************************
-../rom/altair-engine-stub.SIS /epoc32/data/z/system/install/altair-engine-stub.SIS
+../rom/altair-engine-stub.sis /epoc32/data/z/system/install/altair-engine-stub.SIS
//altair-pcd-adapter-stub.SIS /epoc32/data/z/system/install/altair-pcd-adapter-stub.SIS
//****************************************************************************
--- a/ncdengine/provider/server/inc/ncdfavoritemanagerimpl.h Fri Mar 12 15:43:14 2010 +0200
+++ b/ncdengine/provider/server/inc/ncdfavoritemanagerimpl.h Mon Mar 15 12:41:05 2010 +0200
@@ -107,9 +107,92 @@
virtual void CounterPartLost(
const MCatalogsSession& aSession );
+private:
+
+ /**
+ * CNcdClientFavorites object encapsulates the favorite identifiers of one
+ * client.
+ */
+ class CNcdClientFavorites : public CBase,
+ public MNcdStorageDataItem
+ {
+ public:
+ static CNcdClientFavorites* NewLC( const TUid& aClientUid );
+ ~CNcdClientFavorites();
+
+ TUid ClientUid() const;
+ void AddFavoriteL( CNcdNodeIdentifier* aNodeIdentifier );
+ void RemoveFavorite( const CNcdNodeIdentifier& aNodeIdentifier );
+ void RemoveFavorites();
+ void SetDisclaimerL(
+ const CNcdNodeIdentifier& aNodeIdentifier,
+ const CNcdNodeDisclaimer& aDisclaimer );
+ void RemoveDisclaimer( const CNcdNodeIdentifier& aNodeIdentifier );
+ CNcdNodeDisclaimer* Disclaimer(
+ const CNcdNodeIdentifier& aNodeIdentifier ) const;
+
+ TBool HasFavorite( const CNcdNodeIdentifier& aNodeIdentifier ) const;
+
+ const RPointerArray<CNcdNodeIdentifier>& Identifiers() const;
+ void ExternalizeIdentifiersL( RWriteStream& aStream ) const;
+
+ public: // from MNcdStorageDataItem
+
+ /*
+ * @see MNcdStorageDataItem::ExternalizeL
+ */
+ virtual void ExternalizeL( RWriteStream& aStream );
+
+ /*
+ * @see MNcdStorageDataItem::InternalizeL
+ */
+ virtual void InternalizeL( RReadStream& aStream );
+
+ protected:
+ CNcdClientFavorites( const TUid& aClientUid );
+ void CloseDisclaimers();
+
+ private:
+
+ // Node identifiers.
+ RPointerArray<CNcdNodeIdentifier> iIdentifiers;
+ // Node disclaimers. A disclaimer at index 'i' is disclaimer of the node at
+ // the same index.
+ RPointerArray<CNcdNodeDisclaimer> iDisclaimers;
+
+ // Client uid.
+ TUid iClientUid;
+ };
+
+
+ class CNcdTemporaryFavorites : public CBase
+ {
+ public: // public functions
+ CNcdTemporaryFavorites( MCatalogsSession& aSession );
+ ~CNcdTemporaryFavorites();
+
+
+ public: // member variables
+ MCatalogsSession& iSession;
+ RPointerArray<CNcdNodeIdentifier> iFavoriteIdentifiers;
+ };
+
+ CNcdGeneralManager& iGeneralManager;
+
+ // Node manager.
+ CNcdNodeManager& iNodeManager;
+
+ // Favorite nodes of all the clients.
+ RPointerArray<CNcdClientFavorites> iFavorites;
+
+ // Temp favorite mappings.
+ RPointerArray<CNcdTemporaryFavorites> iTempFavorites;
+
+ // Storage manager.
+ MNcdStorageManager& iStorageManager;
+
protected:
- class CNcdClientFavorites;
class CNcdTemporaryFavorites;
CNcdFavoriteManager( CNcdGeneralManager& aGeneralManager );
@@ -234,89 +317,6 @@
void DbSaveFavoritesL( CNcdClientFavorites& aFavorites );
-private:
-
- /**
- * CNcdClientFavorites object encapsulates the favorite identifiers of one
- * client.
- */
- class CNcdClientFavorites : public CBase,
- public MNcdStorageDataItem
- {
- public:
- static CNcdClientFavorites* NewLC( const TUid& aClientUid );
- ~CNcdClientFavorites();
-
- TUid ClientUid() const;
- void AddFavoriteL( CNcdNodeIdentifier* aNodeIdentifier );
- void RemoveFavorite( const CNcdNodeIdentifier& aNodeIdentifier );
- void RemoveFavorites();
- void SetDisclaimerL(
- const CNcdNodeIdentifier& aNodeIdentifier,
- const CNcdNodeDisclaimer& aDisclaimer );
- void RemoveDisclaimer( const CNcdNodeIdentifier& aNodeIdentifier );
- CNcdNodeDisclaimer* Disclaimer(
- const CNcdNodeIdentifier& aNodeIdentifier ) const;
-
- TBool HasFavorite( const CNcdNodeIdentifier& aNodeIdentifier ) const;
-
- const RPointerArray<CNcdNodeIdentifier>& Identifiers() const;
- void ExternalizeIdentifiersL( RWriteStream& aStream ) const;
-
- public: // from MNcdStorageDataItem
-
- /*
- * @see MNcdStorageDataItem::ExternalizeL
- */
- virtual void ExternalizeL( RWriteStream& aStream );
-
- /*
- * @see MNcdStorageDataItem::InternalizeL
- */
- virtual void InternalizeL( RReadStream& aStream );
-
- protected:
- CNcdClientFavorites( const TUid& aClientUid );
- void CloseDisclaimers();
-
- private:
-
- // Node identifiers.
- RPointerArray<CNcdNodeIdentifier> iIdentifiers;
- // Node disclaimers. A disclaimer at index 'i' is disclaimer of the node at
- // the same index.
- RPointerArray<CNcdNodeDisclaimer> iDisclaimers;
-
- // Client uid.
- TUid iClientUid;
- };
-
-
- class CNcdTemporaryFavorites : public CBase
- {
- public: // public functions
- CNcdTemporaryFavorites( MCatalogsSession& aSession );
- ~CNcdTemporaryFavorites();
-
-
- public: // member variables
- MCatalogsSession& iSession;
- RPointerArray<CNcdNodeIdentifier> iFavoriteIdentifiers;
- };
-
- CNcdGeneralManager& iGeneralManager;
-
- // Node manager.
- CNcdNodeManager& iNodeManager;
-
- // Favorite nodes of all the clients.
- RPointerArray<CNcdClientFavorites> iFavorites;
-
- // Temp favorite mappings.
- RPointerArray<CNcdTemporaryFavorites> iTempFavorites;
-
- // Storage manager.
- MNcdStorageManager& iStorageManager;
};
#endif
--- a/secureswitools/swisistools/group/bld.inf Fri Mar 12 15:43:14 2010 +0200
+++ b/secureswitools/swisistools/group/bld.inf Mon Mar 15 12:41:05 2010 +0200
@@ -814,6 +814,7 @@
../test/tinterpretsisinteg/data/interpretsism.dll /epoc32/winscw/c/tswi/tinterpretsisinteg/data/interpretsism.dll
../test/tinterpretsisinteg/data/802730a9_0.sis /epoc32/winscw/c/tswi/tinterpretsisinteg/data/802730a9_0.sis
../test/tinterpretsisinteg/data/test_stub.sis /epoc32/data/z/system/install/test_stub.sis
+../test/tinterpretsisinteg/data/int_nr_option_01_stub.sis /epoc32/winscw/c/tswi/tinterpretsisinteg/data/int_nr_option_01_stub.sis
../test/tinterpretsisinteg/parameters_file/parameters.ini /epoc32/winscw/c/tswi/tinterpretsisinteg/parameters_file/parameters.ini
../test/tinterpretsisinteg/parameters_file/int001-006.txt /epoc32/winscw/c/tswi/tinterpretsisinteg/parameters_file/int001-006.txt
@@ -1441,6 +1442,9 @@
../test/tinterpretsisinteg/parameters_file/testdata_pkgversion_d005file.txt /epoc32/winscw/c/tswi/tinterpretsisinteg/parameters_file/testdata_pkgversion_d005file.txt
../test/tinterpretsisinteg/parameters_file/testdata_pkgversion_d006file.txt /epoc32/winscw/c/tswi/tinterpretsisinteg/parameters_file/testdata_pkgversion_d006file.txt
../test/tinterpretsisinteg/parameters_file/testdata_pkgversion_d007file.txt /epoc32/winscw/c/tswi/tinterpretsisinteg/parameters_file/testdata_pkgversion_d007file.txt
+../test/tinterpretsisinteg/parameters_file/int_nr_option_02.txt /epoc32/winscw/c/tswi/tinterpretsisinteg/parameters_file/int_nr_option_02.txt
+../test/tinterpretsisinteg/parameters_file/int_nr_option_04.txt /epoc32/winscw/c/tswi/tinterpretsisinteg/parameters_file/int_nr_option_04.txt
+../test/tinterpretsisinteg/parameters_file/int_nr_option_38.txt /epoc32/winscw/c/tswi/tinterpretsisinteg/parameters_file/int_nr_option_38.txt
//script files for PREQ2525 installing equivalent language
@@ -1463,8 +1467,86 @@
../test/tinterpretsisinteg/api-inst-preq2525-interpretsis-17.bat /epoc32/winscw/c/tswi/tinterpretsisinteg/api-inst-preq2525-interpretsis-17.bat
../test/tinterpretsisinteg/api-inst-preq2525-interpretsis-18.bat /epoc32/winscw/c/tswi/tinterpretsisinteg/api-inst-preq2525-interpretsis-18.bat
../test/tinterpretsisinteg/api-inst-preq2525-interpretsis-19.bat /epoc32/winscw/c/tswi/tinterpretsisinteg/api-inst-preq2525-interpretsis-19.bat
+../test/tinterpretsisinteg/int_nr_option-01.bat /epoc32/winscw/c/tswi/tinterpretsisinteg/int_nr_option-01.bat
+../test/tinterpretsisinteg/int_nr_option-02.bat /epoc32/winscw/c/tswi/tinterpretsisinteg/int_nr_option-02.bat
+../test/tinterpretsisinteg/int_nr_option-03.bat /epoc32/winscw/c/tswi/tinterpretsisinteg/int_nr_option-03.bat
+../test/tinterpretsisinteg/int_nr_option-04.bat /epoc32/winscw/c/tswi/tinterpretsisinteg/int_nr_option-04.bat
+../test/tinterpretsisinteg/int_nr_option-05.bat /epoc32/winscw/c/tswi/tinterpretsisinteg/int_nr_option-05.bat
+../test/tinterpretsisinteg/int_nr_option-06.bat /epoc32/winscw/c/tswi/tinterpretsisinteg/int_nr_option-06.bat
+../test/tinterpretsisinteg/int_nr_option-07.bat /epoc32/winscw/c/tswi/tinterpretsisinteg/int_nr_option-07.bat
+../test/tinterpretsisinteg/int_nr_option-08.bat /epoc32/winscw/c/tswi/tinterpretsisinteg/int_nr_option-08.bat
+../test/tinterpretsisinteg/int_nr_option-09.bat /epoc32/winscw/c/tswi/tinterpretsisinteg/int_nr_option-09.bat
+../test/tinterpretsisinteg/int_nr_option-10.bat /epoc32/winscw/c/tswi/tinterpretsisinteg/int_nr_option-10.bat
+../test/tinterpretsisinteg/int_nr_option-11.bat /epoc32/winscw/c/tswi/tinterpretsisinteg/int_nr_option-11.bat
+../test/tinterpretsisinteg/int_nr_option-12.bat /epoc32/winscw/c/tswi/tinterpretsisinteg/int_nr_option-12.bat
+../test/tinterpretsisinteg/int_nr_option-13.bat /epoc32/winscw/c/tswi/tinterpretsisinteg/int_nr_option-13.bat
+../test/tinterpretsisinteg/int_nr_option-14.bat /epoc32/winscw/c/tswi/tinterpretsisinteg/int_nr_option-14.bat
+../test/tinterpretsisinteg/int_nr_option-15.bat /epoc32/winscw/c/tswi/tinterpretsisinteg/int_nr_option-15.bat
+../test/tinterpretsisinteg/int_nr_option-16.bat /epoc32/winscw/c/tswi/tinterpretsisinteg/int_nr_option-16.bat
+../test/tinterpretsisinteg/int_nr_option-17.bat /epoc32/winscw/c/tswi/tinterpretsisinteg/int_nr_option-17.bat
+../test/tinterpretsisinteg/int_nr_option-18.bat /epoc32/winscw/c/tswi/tinterpretsisinteg/int_nr_option-18.bat
+../test/tinterpretsisinteg/int_nr_option-19.bat /epoc32/winscw/c/tswi/tinterpretsisinteg/int_nr_option-19.bat
+../test/tinterpretsisinteg/int_nr_option-20.bat /epoc32/winscw/c/tswi/tinterpretsisinteg/int_nr_option-20.bat
+../test/tinterpretsisinteg/int_nr_option-21.bat /epoc32/winscw/c/tswi/tinterpretsisinteg/int_nr_option-21.bat
+../test/tinterpretsisinteg/int_nr_option-22.bat /epoc32/winscw/c/tswi/tinterpretsisinteg/int_nr_option-22.bat
+../test/tinterpretsisinteg/int_nr_option-23.bat /epoc32/winscw/c/tswi/tinterpretsisinteg/int_nr_option-23.bat
+../test/tinterpretsisinteg/int_nr_option-24.bat /epoc32/winscw/c/tswi/tinterpretsisinteg/int_nr_option-24.bat
+../test/tinterpretsisinteg/int_nr_option-25.bat /epoc32/winscw/c/tswi/tinterpretsisinteg/int_nr_option-25.bat
+../test/tinterpretsisinteg/int_nr_option-26.bat /epoc32/winscw/c/tswi/tinterpretsisinteg/int_nr_option-26.bat
+../test/tinterpretsisinteg/int_nr_option-27.bat /epoc32/winscw/c/tswi/tinterpretsisinteg/int_nr_option-27.bat
+../test/tinterpretsisinteg/int_nr_option-28.bat /epoc32/winscw/c/tswi/tinterpretsisinteg/int_nr_option-28.bat
+../test/tinterpretsisinteg/int_nr_option-29.bat /epoc32/winscw/c/tswi/tinterpretsisinteg/int_nr_option-29.bat
+../test/tinterpretsisinteg/int_nr_option-30.bat /epoc32/winscw/c/tswi/tinterpretsisinteg/int_nr_option-30.bat
+../test/tinterpretsisinteg/int_nr_option-31.bat /epoc32/winscw/c/tswi/tinterpretsisinteg/int_nr_option-31.bat
+../test/tinterpretsisinteg/int_nr_option-32.bat /epoc32/winscw/c/tswi/tinterpretsisinteg/int_nr_option-32.bat
+../test/tinterpretsisinteg/int_nr_option-33.bat /epoc32/winscw/c/tswi/tinterpretsisinteg/int_nr_option-33.bat
+../test/tinterpretsisinteg/int_nr_option-34.bat /epoc32/winscw/c/tswi/tinterpretsisinteg/int_nr_option-34.bat
+../test/tinterpretsisinteg/int_nr_option-35.bat /epoc32/winscw/c/tswi/tinterpretsisinteg/int_nr_option-35.bat
+../test/tinterpretsisinteg/int_nr_option-36.bat /epoc32/winscw/c/tswi/tinterpretsisinteg/int_nr_option-36.bat
+../test/tinterpretsisinteg/int_nr_option-37.bat /epoc32/winscw/c/tswi/tinterpretsisinteg/int_nr_option-37.bat
+../test/tinterpretsisinteg/int_nr_option-38.bat /epoc32/winscw/c/tswi/tinterpretsisinteg/int_nr_option-38.bat
+../test/tinterpretsisinteg/int_nr_option-39.bat /epoc32/winscw/c/tswi/tinterpretsisinteg/int_nr_option-39.bat
../test/tinterpretsisinteg/scripts/api-inst-preq2525-interpretsis-18.script /epoc32/winscw/c/tswi/tinterpretsisinteg/scripts/api-inst-preq2525-interpretsis-18.script
+../test/tinterpretsisinteg/scripts/int_nr_option-01.script /epoc32/winscw/c/tswi/tinterpretsisinteg/scripts/int_nr_option-01.script
+../test/tinterpretsisinteg/scripts/int_nr_option-02.script /epoc32/winscw/c/tswi/tinterpretsisinteg/scripts/int_nr_option-02.script
+../test/tinterpretsisinteg/scripts/int_nr_option-03.script /epoc32/winscw/c/tswi/tinterpretsisinteg/scripts/int_nr_option-03.script
+../test/tinterpretsisinteg/scripts/int_nr_option-05.script /epoc32/winscw/c/tswi/tinterpretsisinteg/scripts/int_nr_option-05.script
+../test/tinterpretsisinteg/scripts/int_nr_option-06.script /epoc32/winscw/c/tswi/tinterpretsisinteg/scripts/int_nr_option-06.script
+../test/tinterpretsisinteg/scripts/int_nr_option-07.script /epoc32/winscw/c/tswi/tinterpretsisinteg/scripts/int_nr_option-07.script
+../test/tinterpretsisinteg/scripts/int_nr_option-08.script /epoc32/winscw/c/tswi/tinterpretsisinteg/scripts/int_nr_option-08.script
+../test/tinterpretsisinteg/scripts/int_nr_option-09.script /epoc32/winscw/c/tswi/tinterpretsisinteg/scripts/int_nr_option-09.script
+../test/tinterpretsisinteg/scripts/int_nr_option-10.script /epoc32/winscw/c/tswi/tinterpretsisinteg/scripts/int_nr_option-10.script
+../test/tinterpretsisinteg/scripts/int_nr_option-11.script /epoc32/winscw/c/tswi/tinterpretsisinteg/scripts/int_nr_option-11.script
+../test/tinterpretsisinteg/scripts/int_nr_option-12.script /epoc32/winscw/c/tswi/tinterpretsisinteg/scripts/int_nr_option-12.script
+../test/tinterpretsisinteg/scripts/int_nr_option-13.script /epoc32/winscw/c/tswi/tinterpretsisinteg/scripts/int_nr_option-13.script
+../test/tinterpretsisinteg/scripts/int_nr_option-14.script /epoc32/winscw/c/tswi/tinterpretsisinteg/scripts/int_nr_option-14.script
+../test/tinterpretsisinteg/scripts/int_nr_option-15.script /epoc32/winscw/c/tswi/tinterpretsisinteg/scripts/int_nr_option-15.script
+../test/tinterpretsisinteg/scripts/int_nr_option-16.script /epoc32/winscw/c/tswi/tinterpretsisinteg/scripts/int_nr_option-16.script
+../test/tinterpretsisinteg/scripts/int_nr_option-17.script /epoc32/winscw/c/tswi/tinterpretsisinteg/scripts/int_nr_option-17.script
+../test/tinterpretsisinteg/scripts/int_nr_option-18.script /epoc32/winscw/c/tswi/tinterpretsisinteg/scripts/int_nr_option-18.script
+../test/tinterpretsisinteg/scripts/int_nr_option-19.script /epoc32/winscw/c/tswi/tinterpretsisinteg/scripts/int_nr_option-19.script
+../test/tinterpretsisinteg/scripts/int_nr_option-20.script /epoc32/winscw/c/tswi/tinterpretsisinteg/scripts/int_nr_option-20.script
+../test/tinterpretsisinteg/scripts/int_nr_option-21.script /epoc32/winscw/c/tswi/tinterpretsisinteg/scripts/int_nr_option-21.script
+../test/tinterpretsisinteg/scripts/int_nr_option-22.script /epoc32/winscw/c/tswi/tinterpretsisinteg/scripts/int_nr_option-22.script
+../test/tinterpretsisinteg/scripts/int_nr_option-23.script /epoc32/winscw/c/tswi/tinterpretsisinteg/scripts/int_nr_option-23.script
+../test/tinterpretsisinteg/scripts/int_nr_option-24.script /epoc32/winscw/c/tswi/tinterpretsisinteg/scripts/int_nr_option-24.script
+../test/tinterpretsisinteg/scripts/int_nr_option-25.script /epoc32/winscw/c/tswi/tinterpretsisinteg/scripts/int_nr_option-25.script
+../test/tinterpretsisinteg/scripts/int_nr_option-26.script /epoc32/winscw/c/tswi/tinterpretsisinteg/scripts/int_nr_option-26.script
+../test/tinterpretsisinteg/scripts/int_nr_option-27.script /epoc32/winscw/c/tswi/tinterpretsisinteg/scripts/int_nr_option-27.script
+../test/tinterpretsisinteg/scripts/int_nr_option-28.script /epoc32/winscw/c/tswi/tinterpretsisinteg/scripts/int_nr_option-28.script
+../test/tinterpretsisinteg/scripts/int_nr_option-29.script /epoc32/winscw/c/tswi/tinterpretsisinteg/scripts/int_nr_option-29.script
+../test/tinterpretsisinteg/scripts/int_nr_option-30.script /epoc32/winscw/c/tswi/tinterpretsisinteg/scripts/int_nr_option-30.script
+../test/tinterpretsisinteg/scripts/int_nr_option-31.script /epoc32/winscw/c/tswi/tinterpretsisinteg/scripts/int_nr_option-31.script
+../test/tinterpretsisinteg/scripts/int_nr_option-32.script /epoc32/winscw/c/tswi/tinterpretsisinteg/scripts/int_nr_option-32.script
+../test/tinterpretsisinteg/scripts/int_nr_option-33.script /epoc32/winscw/c/tswi/tinterpretsisinteg/scripts/int_nr_option-33.script
+../test/tinterpretsisinteg/scripts/int_nr_option-34.script /epoc32/winscw/c/tswi/tinterpretsisinteg/scripts/int_nr_option-34.script
+../test/tinterpretsisinteg/scripts/int_nr_option-35.script /epoc32/winscw/c/tswi/tinterpretsisinteg/scripts/int_nr_option-35.script
+../test/tinterpretsisinteg/scripts/int_nr_option-36.script /epoc32/winscw/c/tswi/tinterpretsisinteg/scripts/int_nr_option-36.script
+../test/tinterpretsisinteg/scripts/int_nr_option-37.script /epoc32/winscw/c/tswi/tinterpretsisinteg/scripts/int_nr_option-37.script
+../test/tinterpretsisinteg/scripts/int_nr_option-38.script /epoc32/winscw/c/tswi/tinterpretsisinteg/scripts/int_nr_option-38.script
+../test/tinterpretsisinteg/scripts/int_nr_option-39.script /epoc32/winscw/c/tswi/tinterpretsisinteg/scripts/int_nr_option-39.script
+
../test/tinterpretsisinteg/preq2525-interpretsis-01/argumentfile.ini /epoc32/winscw/c/tswi/tinterpretsisinteg/preq2525-interpretsis-01/argumentfile.ini
../test/tinterpretsisinteg/preq2525-interpretsis-02/argumentfile.ini /epoc32/winscw/c/tswi/tinterpretsisinteg/preq2525-interpretsis-02/argumentfile.ini
../test/tinterpretsisinteg/preq2525-interpretsis-03/argumentfile.ini /epoc32/winscw/c/tswi/tinterpretsisinteg/preq2525-interpretsis-03/argumentfile.ini
@@ -1737,8 +1819,49 @@
../test/tinterpretsisinteg/makesisv001_db.bat /epoc32/winscw/c/tswi/tinterpretsisinteg/makesisv001_db.bat
../test/tinterpretsisinteg/makesisw001_db.bat /epoc32/winscw/c/tswi/tinterpretsisinteg/makesisw001_db.bat
+../test/tinterpretsisinteg/int_nr_option-01_db.bat /epoc32/winscw/c/tswi/tinterpretsisinteg/int_nr_option-01_db.bat
+../test/tinterpretsisinteg/int_nr_option-02_db.bat /epoc32/winscw/c/tswi/tinterpretsisinteg/int_nr_option-02_db.bat
+../test/tinterpretsisinteg/int_nr_option-03_db.bat /epoc32/winscw/c/tswi/tinterpretsisinteg/int_nr_option-03_db.bat
+../test/tinterpretsisinteg/int_nr_option-04_db.bat /epoc32/winscw/c/tswi/tinterpretsisinteg/int_nr_option-04_db.bat
+../test/tinterpretsisinteg/int_nr_option-05_db.bat /epoc32/winscw/c/tswi/tinterpretsisinteg/int_nr_option-05_db.bat
+../test/tinterpretsisinteg/int_nr_option-06_db.bat /epoc32/winscw/c/tswi/tinterpretsisinteg/int_nr_option-06_db.bat
+../test/tinterpretsisinteg/int_nr_option-07_db.bat /epoc32/winscw/c/tswi/tinterpretsisinteg/int_nr_option-07_db.bat
+../test/tinterpretsisinteg/int_nr_option-08_db.bat /epoc32/winscw/c/tswi/tinterpretsisinteg/int_nr_option-08_db.bat
+../test/tinterpretsisinteg/int_nr_option-09_db.bat /epoc32/winscw/c/tswi/tinterpretsisinteg/int_nr_option-09_db.bat
+../test/tinterpretsisinteg/int_nr_option-10_db.bat /epoc32/winscw/c/tswi/tinterpretsisinteg/int_nr_option-10_db.bat
+../test/tinterpretsisinteg/int_nr_option-11_db.bat /epoc32/winscw/c/tswi/tinterpretsisinteg/int_nr_option-11_db.bat
+../test/tinterpretsisinteg/int_nr_option-12_db.bat /epoc32/winscw/c/tswi/tinterpretsisinteg/int_nr_option-12_db.bat
+../test/tinterpretsisinteg/int_nr_option-13_db.bat /epoc32/winscw/c/tswi/tinterpretsisinteg/int_nr_option-13_db.bat
+../test/tinterpretsisinteg/int_nr_option-14_db.bat /epoc32/winscw/c/tswi/tinterpretsisinteg/int_nr_option-14_db.bat
+../test/tinterpretsisinteg/int_nr_option-15_db.bat /epoc32/winscw/c/tswi/tinterpretsisinteg/int_nr_option-15_db.bat
+../test/tinterpretsisinteg/int_nr_option-16_db.bat /epoc32/winscw/c/tswi/tinterpretsisinteg/int_nr_option-16_db.bat
+../test/tinterpretsisinteg/int_nr_option-17_db.bat /epoc32/winscw/c/tswi/tinterpretsisinteg/int_nr_option-17_db.bat
+../test/tinterpretsisinteg/int_nr_option-18_db.bat /epoc32/winscw/c/tswi/tinterpretsisinteg/int_nr_option-18_db.bat
+../test/tinterpretsisinteg/int_nr_option-19_db.bat /epoc32/winscw/c/tswi/tinterpretsisinteg/int_nr_option-19_db.bat
+../test/tinterpretsisinteg/int_nr_option-20_db.bat /epoc32/winscw/c/tswi/tinterpretsisinteg/int_nr_option-20_db.bat
+../test/tinterpretsisinteg/int_nr_option-21_db.bat /epoc32/winscw/c/tswi/tinterpretsisinteg/int_nr_option-21_db.bat
+../test/tinterpretsisinteg/int_nr_option-22_db.bat /epoc32/winscw/c/tswi/tinterpretsisinteg/int_nr_option-22_db.bat
+../test/tinterpretsisinteg/int_nr_option-23_db.bat /epoc32/winscw/c/tswi/tinterpretsisinteg/int_nr_option-23_db.bat
+../test/tinterpretsisinteg/int_nr_option-24_db.bat /epoc32/winscw/c/tswi/tinterpretsisinteg/int_nr_option-24_db.bat
+../test/tinterpretsisinteg/int_nr_option-25_db.bat /epoc32/winscw/c/tswi/tinterpretsisinteg/int_nr_option-25_db.bat
+../test/tinterpretsisinteg/int_nr_option-26_db.bat /epoc32/winscw/c/tswi/tinterpretsisinteg/int_nr_option-26_db.bat
+../test/tinterpretsisinteg/int_nr_option-27_db.bat /epoc32/winscw/c/tswi/tinterpretsisinteg/int_nr_option-27_db.bat
+../test/tinterpretsisinteg/int_nr_option-28_db.bat /epoc32/winscw/c/tswi/tinterpretsisinteg/int_nr_option-28_db.bat
+../test/tinterpretsisinteg/int_nr_option-29_db.bat /epoc32/winscw/c/tswi/tinterpretsisinteg/int_nr_option-29_db.bat
+../test/tinterpretsisinteg/int_nr_option-30_db.bat /epoc32/winscw/c/tswi/tinterpretsisinteg/int_nr_option-30_db.bat
+../test/tinterpretsisinteg/int_nr_option-31_db.bat /epoc32/winscw/c/tswi/tinterpretsisinteg/int_nr_option-31_db.bat
+../test/tinterpretsisinteg/int_nr_option-32_db.bat /epoc32/winscw/c/tswi/tinterpretsisinteg/int_nr_option-32_db.bat
+../test/tinterpretsisinteg/int_nr_option-33_db.bat /epoc32/winscw/c/tswi/tinterpretsisinteg/int_nr_option-33_db.bat
+../test/tinterpretsisinteg/int_nr_option-34_db.bat /epoc32/winscw/c/tswi/tinterpretsisinteg/int_nr_option-34_db.bat
+../test/tinterpretsisinteg/int_nr_option-35_db.bat /epoc32/winscw/c/tswi/tinterpretsisinteg/int_nr_option-35_db.bat
+../test/tinterpretsisinteg/int_nr_option-36_db.bat /epoc32/winscw/c/tswi/tinterpretsisinteg/int_nr_option-36_db.bat
+../test/tinterpretsisinteg/int_nr_option-37_db.bat /epoc32/winscw/c/tswi/tinterpretsisinteg/int_nr_option-37_db.bat
+../test/tinterpretsisinteg/int_nr_option-38_db.bat /epoc32/winscw/c/tswi/tinterpretsisinteg/int_nr_option-38_db.bat
+../test/tinterpretsisinteg/int_nr_option-39_db.bat /epoc32/winscw/c/tswi/tinterpretsisinteg/int_nr_option-39_db.bat
+
../test/tinterpretsisinteg/parameters_file/testcasef009file_db.txt /epoc32/winscw/c/tswi/tinterpretsisinteg/parameters_file/testcasef009file_db.txt
../test/tinterpretsisinteg/parameters_file/testcasei003file_db.txt /epoc32/winscw/c/tswi/tinterpretsisinteg/parameters_file/testcasei003file_db.txt
+../test/tinterpretsisinteg/parameters_file/int_nr_option_02_db.txt /epoc32/winscw/c/tswi/tinterpretsisinteg/parameters_file/int_nr_option_02_db.txt
../test/tinterpretsisinteg/scripts/swi003-001_db.script /epoc32/winscw/c/tswi/tinterpretsisinteg/scripts/swi003-001_db.script
--- a/secureswitools/swisistools/source/interpretsis/commandparser.cpp Fri Mar 12 15:43:14 2010 +0200
+++ b/secureswitools/swisistools/source/interpretsis/commandparser.cpp Mon Mar 15 12:41:05 2010 +0200
@@ -161,6 +161,7 @@
<< "\tdrive\t\tThe drive letter on the device\n"
<< "\tmcard\t\tOption to generate the stub SIS file for the installing package\n"
<< "\tmcardnr\t\tOption to generate the non-removable stub SIS file for the installing package\n"
+ << "\tnonremovablepkg\tOption to generate the non-removable SIS file for the installing package\n\n"
<< "\tmcardalone\tOption to just create a pre-installed package to the media card\n"
<< "\tmcardalonenr\tOption to generate the non-removable stub SIS file for the installing" << std::endl
<< "\t\t\tpackage without generating the SISregistry entry\n"
@@ -169,7 +170,7 @@
void CCommandParser::DisplayVersion()
{
- std::cout << "\nINTERPRETSIS " << " Version 2.1.2 ." << std::endl;
+ std::cout << "\nINTERPRETSIS " << " Version 2.1.3 ." << std::endl;
std::cout << "Copyright (c) 2009 Symbian Software Ltd. All rights reserved.\n " << std::endl;
}
@@ -543,7 +544,7 @@
else if (versionStr == "+MCARDNR")
{
sisFileName.iGenerateStub = true;
- sisFileName.iNonRemovable = true;
+ sisFileName.iReadOnly = true;
}
else if (versionStr == "+MCARDALONE")
{
@@ -554,12 +555,16 @@
{
sisFileName.iGenerateStub = true;
sisFileName.iNotRegister = true;
- sisFileName.iNonRemovable = true;
+ sisFileName.iReadOnly = true;
}
else if (versionStr == "+SUCERT")
{
sisFileName.iSUFlag = true;
}
+ else if (versionStr == "+NONREMOVABLEPKG")
+ {
+ sisFileName.iNonRemovable = true;
+ }
else
throw CCommandParser::ECmdLineInvalidSISFileAttribute;
}
--- a/secureswitools/swisistools/source/interpretsislib/installer.cpp Fri Mar 12 15:43:14 2010 +0200
+++ b/secureswitools/swisistools/source/interpretsislib/installer.cpp Mon Mar 15 12:41:05 2010 +0200
@@ -128,7 +128,7 @@
{
InstallSISFile sisFileName(shortName + KDirectorySeparator + *currStr,
curr->iTargetDrive, curr->iGenerateStub,
- curr->iNonRemovable, curr->iNotRegister, curr->iSUFlag);
+ curr->iNonRemovable, curr->iReadOnly, curr->iNotRegister, curr->iSUFlag);
sisFiles.push_back(sisFileName);
}
@@ -143,7 +143,7 @@
|| (shortName.find(L".sis",0) != std::wstring::npos))
{
InstallSISFile sisFileName(shortName, curr->iTargetDrive, curr->iGenerateStub,
- curr->iNonRemovable, curr->iNotRegister, curr->iSUFlag);
+ curr->iNonRemovable, curr->iReadOnly, curr->iNotRegister, curr->iSUFlag);
sisFiles.push_back(sisFileName);
}
@@ -275,7 +275,7 @@
return MISSING_DEPENDENCY;
}
- if (!IsValidUpgrade(file, aInstallSISFile.iSUFlag))
+ if (!IsValidUpgrade(file, aInstallSISFile.iSUFlag, aInstallSISFile.iNonRemovable))
{
return INVALID_UPGRADE;
}
@@ -482,10 +482,19 @@
}
-bool Installer::IsValidUpgrade(const SisFile& aFile, bool aSUFlag)
+bool Installer::IsValidUpgrade(const SisFile& aFile, bool aSUFlag, bool aNonRemovable)
{
TUint32 pkg = aFile.GetPackageUid();
TUint32 installFlags = aFile.GetInstallFlags();
+
+ if(aNonRemovable)
+ {
+ TUint8 iFlag = 0;
+ iFlag |= CSISInfo::EInstFlagNonRemovable;
+ aFile.AddInstallFlags(iFlag);
+ installFlags = aFile.GetInstallFlags();
+ }
+
bool RUFlag = ((installFlags & CSISInfo::EInstFlagROMUpgrade) && CSISInfo::EInstFlagROMUpgrade);
if(iParamList.RegistryVersionExists())
@@ -510,7 +519,7 @@
if (iRegistry.IsInstalled(pkg))
{
- ValidateRegistry(aFile,pkg,installFlags,RUFlag);
+ ValidateRegistry(aFile,pkg,installFlags,RUFlag,aNonRemovable);
}
else if (installType == CSISInfo::EInstAugmentation || installType == CSISInfo::EInstPartialUpgrade)
{
@@ -525,7 +534,7 @@
return true;
}
-void Installer::ValidateRegistry(const SisFile& aFile, TUint32 aPckgUid, TUint32 aInstallFlags, bool aRUFlag)
+void Installer::ValidateRegistry(const SisFile& aFile, TUint32 aPckgUid, TUint32 aInstallFlags, bool aRUFlag, bool aNonRemovable)
{
bool isSisNonRemovable = aInstallFlags & CSISInfo::EInstFlagNonRemovable;
bool isBaseRemovable = false;
@@ -589,10 +598,13 @@
// The only exception is a ROM stub which is upgradable and non-removable by definition.
if ((isBaseRemovable == isSisNonRemovable) && !inRom )
{
- std::stringstream err;
- err << "Cannot install PU (0x" << std::hex << aPckgUid << ") to a base package with a different removable flag type";
+ if(!aNonRemovable)
+ {
+ std::stringstream err;
+ err << "Cannot install PU (0x" << std::hex << aPckgUid << ") to a base package with a different removable flag type";
- throw InterpretSisError(err.str(), INVALID_UPGRADE);
+ throw InterpretSisError(err.str(), INVALID_UPGRADE);
+ }
}
}
else if (installType == CSISInfo::EInstPreInstalledApp)
@@ -1552,7 +1564,7 @@
aSis.MakeSISStub(ctrl);
// If the NR flag is set, change the file attribute to RO
- if (aInstallSISFile.iNonRemovable)
+ if (aInstallSISFile.iReadOnly)
{
_wchmod(ctrl.c_str(),_S_IREAD);
}
--- a/secureswitools/swisistools/source/interpretsislib/installer.h Fri Mar 12 15:43:14 2010 +0200
+++ b/secureswitools/swisistools/source/interpretsislib/installer.h Mon Mar 15 12:41:05 2010 +0200
@@ -72,9 +72,9 @@
bool DependenciesOk(const SisFile& aFile); // Check to see if the sis file
// meets it's dependencies
- bool IsValidUpgrade(const SisFile& aFile, bool aSUFlag); // Check to see if this is a valid upgrade
+ bool IsValidUpgrade(const SisFile& aFile, bool aSUFlag, bool aNonRemovable); // Check to see if this is a valid upgrade
// to the existing packages
- void ValidateRegistry(const SisFile& aFile, TUint32 aPckgUid, TUint32 aInstallFlags, bool aRUFlag);
+ void ValidateRegistry(const SisFile& aFile, TUint32 aPckgUid, TUint32 aInstallFlags, bool aRUFlag, bool aNonRemovable);
void InitializeRegistryDetails ( const TUint32 aPckgUid, bool& aIsBaseRemovable, bool& aInRom, bool& aIsPreInstalled, TUint32& aUid, std::wstring& aPackageName );
--- a/secureswitools/swisistools/source/interpretsislib/parameterlist.h Fri Mar 12 15:43:14 2010 +0200
+++ b/secureswitools/swisistools/source/interpretsislib/parameterlist.h Mon Mar 15 12:41:05 2010 +0200
@@ -45,28 +45,29 @@
* Default constructor.
*/
InstallSISFile() : iFileName(L""), iTargetDrive(L'$'), iGenerateStub(false),
- iNonRemovable(false), iNotRegister(false), iSUFlag(false) {}
+ iNonRemovable(false),iReadOnly(false), iNotRegister(false), iSUFlag(false) {}
/**
* Constructor
*/
InstallSISFile(std::wstring aName, int aDrive, bool aSUFlag)
: iFileName(aName), iTargetDrive(aDrive), iGenerateStub(false),
- iNonRemovable(false), iNotRegister(false), iSUFlag(aSUFlag) {}
+ iNonRemovable(false),iReadOnly(false), iNotRegister(false), iSUFlag(aSUFlag) {}
/**
* Constructor
*/
InstallSISFile(std::wstring aName, int aDrive, bool aGenerateStub, bool aNonRemovable,
- bool aNotRegister, bool aSUFlag)
+ bool aReadOnly, bool aNotRegister, bool aSUFlag)
: iFileName(aName), iTargetDrive(aDrive), iGenerateStub(aGenerateStub),
- iNonRemovable(aNonRemovable), iNotRegister(aNotRegister), iSUFlag(aSUFlag) {}
+ iNonRemovable(aNonRemovable), iReadOnly(aReadOnly), iNotRegister(aNotRegister), iSUFlag(aSUFlag) {}
public:
std::wstring iFileName; // SIS file name
int iTargetDrive; // Target drive
bool iGenerateStub; // Whether to generate stub sis file for this sis or not.
bool iNonRemovable; // Whether this is a non-removable SIS or not.
+ bool iReadOnly; // Whether this is a Readonly SIS or not.
bool iNotRegister; // Whether to register the sis or not.
bool iSUFlag; // Whether SU flag is set for this or not.
};
--- a/secureswitools/swisistools/source/interpretsislib/sisfile.cpp Fri Mar 12 15:43:14 2010 +0200
+++ b/secureswitools/swisistools/source/interpretsislib/sisfile.cpp Mon Mar 15 12:41:05 2010 +0200
@@ -301,6 +301,11 @@
return iContents.Controller().SISInfo().InstallationFlag();
}
+void SisFile::AddInstallFlags(const TUint8 aFlag) const
+ {
+ iContents.Controller().AddInstallFlag(aFlag);
+ }
+
TUint32 SisFile::GetLanguage() const
{
return iContents.Controller().Language(0);
--- a/secureswitools/swisistools/source/interpretsislib/sisfile.h Fri Mar 12 15:43:14 2010 +0200
+++ b/secureswitools/swisistools/source/interpretsislib/sisfile.h Mon Mar 15 12:41:05 2010 +0200
@@ -77,6 +77,7 @@
TUint32 GetSigned() const;
TUint32 GetInstallType() const;
TUint32 GetInstallFlags() const;
+ void AddInstallFlags(const TUint8 aFlag) const;
TUint32 GetLanguage() const;
--- a/secureswitools/swisistools/source/interpretsislib/sisregistry.cpp Fri Mar 12 15:43:14 2010 +0200
+++ b/secureswitools/swisistools/source/interpretsislib/sisregistry.cpp Mon Mar 15 12:41:05 2010 +0200
@@ -774,7 +774,7 @@
TUint32 pkg = aSis.GetPackageUid();
SisRegistryObject* obj = GetRegistryObjectPtr(pkg);
- obj->UpgradeEntry(aSis, aFiles, aInstallSISFile.iTargetDrive, aInstallSISFile.iSUFlag, iConfigManager);
+ obj->UpgradeEntry(aSis, aFiles, aInstallSISFile.iTargetDrive, aInstallSISFile.iSUFlag, aInstallSISFile.iNonRemovable, iConfigManager);
// Update/Create the .reg and .ctl files
GenerateRegistryEntry(*obj, aSis);
--- a/secureswitools/swisistools/source/interpretsislib/sisregistryobject.cpp Fri Mar 12 15:43:14 2010 +0200
+++ b/secureswitools/swisistools/source/interpretsislib/sisregistryobject.cpp Mon Mar 15 12:41:05 2010 +0200
@@ -604,7 +604,7 @@
return 0;
}
-void SisRegistryObject::UpgradeEntry(const SisFile& aSis, const InstallableFiles& aFiles, TInt aInstallDrive, const bool aSUFlag, ConfigManager& aConfigManager)
+void SisRegistryObject::UpgradeEntry(const SisFile& aSis, const InstallableFiles& aFiles, TInt aInstallDrive, const bool aSUFlag, const bool aIsRemovable, ConfigManager& aConfigManager)
{
// Version
iVersion = aSis.GetVersion();
@@ -621,6 +621,8 @@
iSignedBySuCert = aSUFlag;
+ if(aIsRemovable)
+ iIsRemovable = false;
iTrust = KSisPackageCertificateChainValidatedToTrustAnchor;
iTrustTimeStamp = 0;
--- a/secureswitools/swisistools/source/interpretsislib/sisregistryobject.h Fri Mar 12 15:43:14 2010 +0200
+++ b/secureswitools/swisistools/source/interpretsislib/sisregistryobject.h Mon Mar 15 12:41:05 2010 +0200
@@ -201,7 +201,7 @@
// Update the entry for a PU installation
void UpgradeEntry(const SisFile& aSis, const InstallableFiles& aFiles,
- TInt aInstallDrive, const bool aSUFlag, ConfigManager& aConfigManager);
+ TInt aInstallDrive, const bool aSUFlag, const bool aIsRemovable, ConfigManager& aConfigManager);
#ifdef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK
void SetValidationStatus(bool aOriginVerificationStatus);
--- a/secureswitools/swisistools/source/sisxlibrary/utility_windows.cpp Fri Mar 12 15:43:14 2010 +0200
+++ b/secureswitools/swisistools/source/sisxlibrary/utility_windows.cpp Mon Mar 15 12:41:05 2010 +0200
@@ -129,7 +129,9 @@
HANDLE MakeSISOpenFile(LPCWSTR pszFilename, DWORD dwAccessMode, DWORD dwCreateFlags)
// Open file with Unicode filename correctly under Win95 and WinNT
{
- return CreateFileW(pszFilename, dwAccessMode, 0, NULL, dwCreateFlags, FILE_ATTRIBUTE_NORMAL, NULL);
+ // Opening the file with FILE_SHARE_READ access, so that other processes can access
+ // the package file in parallel( Issue observed in Raptor with parallel builds udeb and urel)
+ return CreateFileW(pszFilename, dwAccessMode, 1, NULL, dwCreateFlags, FILE_ATTRIBUTE_NORMAL, NULL);
}
BOOL MakeSISDeleteFile(LPCWSTR pszFilename)
Binary file secureswitools/swisistools/test/tinterpretsisinteg/data/int_nr_option_01_stub.sis has changed
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/secureswitools/swisistools/test/tinterpretsisinteg/int_nr_option-01.bat Mon Mar 15 12:41:05 2010 +0200
@@ -0,0 +1,48 @@
+@rem
+@rem Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+@rem All rights reserved.
+@rem This component and the accompanying materials are made available
+@rem under the terms of the License "Eclipse Public License v1.0"
+@rem which accompanies this distribution, and is available
+@rem at the URL "http://www.eclipse.org/legal/sfl-v10.html".
+@rem
+@rem Initial Contributors:
+@rem Nokia Corporation - initial contribution.
+@rem
+@rem Contributors:
+@rem
+@rem Description:
+@rem
+@ECHO OFF
+REM int_nr_option_01
+REM int_nr_option_01 - Install a SIS file with NR CLI option set. This is a positive testcase. Expected Result : SIS file is Installed.
+
+IF NOT EXIST .\backup\cdrive mkdir .\backup\cdrive > NUL
+IF NOT EXIST .\backup\romdrive mkdir .\backup\romdrive > NUL
+if not exist .\cdrive mkdir .\cdrive > NUL
+if not exist .\cdrive\Documents mkdir .\cdrive\Documents > NUL
+if not exist .\romdrive mkdir .\romdrive > NUL
+if not exist .\romdrive\system\ mkdir .\romdrive\system\ > NUL
+if not exist .\romdrive\system\install\ mkdir .\romdrive\system\install\ > NUL
+
+xcopy /E /Y backup\cdrive cdrive > NUL
+xcopy /E /Y backup\romdrive romdrive > NUL
+
+REM Remove installation files from any previous tests
+if exist \epoc32\winscw\c\Documents\abc*.txt del \epoc32\winscw\c\Documents\abc*.txt > NUL
+if exist \epoc32\winscw\c\sys\install\sisregistry\80000086\*.reg del \epoc32\winscw\c\sys\install\sisregistry\80000086\*.reg > NUL
+if exist \epoc32\winscw\c\sys\install\sisregistry\80000086\*.ctl del \epoc32\winscw\c\sys\install\sisregistry\80000086\*.ctl > NUL
+
+call interpretsis -z .\romdrive -c .\cdrive -s \epoc32\winscw\c\tswi\tsis\data\int_nr_option_01.sis +nonremovablepkg -w info -l /epoc32/winscw/c/interpretsis_test_harness.txt > NUL
+
+if not %errorlevel%==0 GOTO LAST
+if not exist \epoc32\winscw\c\Documents mkdir \epoc32\winscw\c\Documents
+call xcopy .\cdrive\sys\install\sisregistry \epoc32\winscw\c\sys\install\sisregistry /S /Y > NUL
+call xcopy .\cdrive\Documents \epoc32\winscw\c\Documents /S /Y > NUL
+if exist \epoc32\winscw\c\sys\install\sisregistry\backup.lst del \epoc32\winscw\c\sys\install\sisregistry\backup.lst > NUL
+
+ECHO ***ERRORCODE*** %errorlevel% PASS>>/epoc32/winscw/c/interpretsis_test_harness.txt
+GOTO END
+:LAST
+ECHO ***ERRORCODE*** %errorlevel% FAIL>>/epoc32/winscw/c/interpretsis_test_harness.txt
+:END
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/secureswitools/swisistools/test/tinterpretsisinteg/int_nr_option-01_db.bat Mon Mar 15 12:41:05 2010 +0200
@@ -0,0 +1,52 @@
+@rem
+@rem Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+@rem All rights reserved.
+@rem This component and the accompanying materials are made available
+@rem under the terms of the License "Eclipse Public License v1.0"
+@rem which accompanies this distribution, and is available
+@rem at the URL "http://www.eclipse.org/legal/sfl-v10.html".
+@rem
+@rem Initial Contributors:
+@rem Nokia Corporation - initial contribution.
+@rem
+@rem Contributors:
+@rem
+@rem Description:
+@rem
+@ECHO OFF
+REM int_nr_option_01
+REM int_nr_option_01 - Install a SIS file with NR CLI option set. This is a positive testcase. Expected Result : SIS file is Installed.
+
+IF NOT EXIST .\backup\cdrive mkdir .\backup\cdrive > NUL
+IF NOT EXIST .\backup\romdrive mkdir .\backup\romdrive > NUL
+if not exist .\cdrive mkdir .\cdrive > NUL
+if not exist .\romdrive mkdir .\romdrive > NUL
+if not exist .\cdrive\Documents mkdir .\cdrive\Documents > NUL
+if not exist .\romdrive\system\ mkdir .\romdrive\system\ > NUL
+if not exist .\romdrive\system\install\ mkdir .\romdrive\system\install\ > NUL
+REM Remove installation files from any previous tests
+if exist .\cdrive\Documents\InstTest\Equivalent*.txt del .\cdrive\Documents\InstTest\Equivalent*.txt > NUL
+
+xcopy /E /Y backup\cdrive cdrive > NUL
+xcopy /E /Y backup\romdrive romdrive > NUL
+
+REM Remove installation files from any previous tests
+if exist \epoc32\winscw\c\Documents\abc*.txt del \epoc32\winscw\c\Documents\abc*.txt > NUL
+if exist \epoc32\winscw\c\sys\install\sisregistry\80000086\*.reg del \epoc32\winscw\c\sys\install\sisregistry\80000086\*.reg > NUL
+if exist \epoc32\winscw\c\sys\install\sisregistry\80000086\*.ctl del \epoc32\winscw\c\sys\install\sisregistry\80000086\*.ctl > NUL
+
+call interpretsis -z .\romdrive -c .\cdrive -s \epoc32\winscw\c\tswi\tsis\data\int_nr_option_01.sis +nonremovablepkg -w info -l /epoc32/winscw/c/interpretsis_test_harness_db.txt > NUL
+
+if not %errorlevel%==0 GOTO LAST
+if not exist \epoc32\winscw\c\Documents mkdir \epoc32\winscw\c\Documents
+call xcopy .\cdrive\Documents \epoc32\winscw\c\Documents /S /Y > NUL
+call xcopy .\cdrive\sys\install\sisregistry \epoc32\winscw\c\sys\install\sisregistry /S /Y > NUL
+if exist \epoc32\winscw\c\sys\install\scr\scr.db del \epoc32\winscw\c\sys\install\scr\scr.db > NUL
+copy .\romdrive\sys\install\scr\provisioned\scr.db \epoc32\winscw\c\sys\install\scr\scr.db /Y > NUL
+if exist \epoc32\winscw\c\sys\install\sisregistry\backup.lst del \epoc32\winscw\c\sys\install\sisregistry\backup.lst > NUL
+
+ECHO ***ERRORCODE*** %errorlevel% PASS>>/epoc32/winscw/c/interpretsis_test_harness_db.txt
+GOTO END
+:LAST
+ECHO ***ERRORCODE*** %errorlevel% FAIL>>/epoc32/winscw/c/interpretsis_test_harness_db.txt
+:END
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/secureswitools/swisistools/test/tinterpretsisinteg/int_nr_option-02.bat Mon Mar 15 12:41:05 2010 +0200
@@ -0,0 +1,48 @@
+@rem
+@rem Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+@rem All rights reserved.
+@rem This component and the accompanying materials are made available
+@rem under the terms of the License "Eclipse Public License v1.0"
+@rem which accompanies this distribution, and is available
+@rem at the URL "http://www.eclipse.org/legal/sfl-v10.html".
+@rem
+@rem Initial Contributors:
+@rem Nokia Corporation - initial contribution.
+@rem
+@rem Contributors:
+@rem
+@rem Description:
+@rem
+@ECHO OFF
+REM int_nr_option_02
+REM int_nr_option_02 - Install a SIS file with NR CLI option set in parameter file. This is a positive testcase. Expected Result : SIS file is Installed.
+
+IF NOT EXIST .\backup\cdrive mkdir .\backup\cdrive > NUL
+IF NOT EXIST .\backup\romdrive mkdir .\backup\romdrive > NUL
+if not exist .\cdrive mkdir .\cdrive > NUL
+if not exist .\cdrive\Documents mkdir .\cdrive\Documents > NUL
+if not exist .\romdrive mkdir .\romdrive > NUL
+if not exist .\romdrive\system\ mkdir .\romdrive\system\ > NUL
+if not exist .\romdrive\system\install\ mkdir .\romdrive\system\install\ > NUL
+
+xcopy /E /Y backup\cdrive cdrive > NUL
+xcopy /E /Y backup\romdrive romdrive > NUL
+
+REM Remove installation files from any previous tests
+if exist \epoc32\winscw\c\Documents\abc*.txt del \epoc32\winscw\c\Documents\abc*.txt > NUL
+if exist \epoc32\winscw\c\sys\install\sisregistry\80000087\*.reg del \epoc32\winscw\c\sys\install\sisregistry\80000087\*.reg > NUL
+if exist \epoc32\winscw\c\sys\install\sisregistry\80000087\*.ctl del \epoc32\winscw\c\sys\install\sisregistry\80000087\*.ctl > NUL
+
+call interpretsis -p \epoc32\winscw\c\tswi\tinterpretsisinteg\parameters_file\int_nr_option_02.txt
+
+if not %errorlevel%==0 GOTO LAST
+if not exist \epoc32\winscw\c\Documents mkdir \epoc32\winscw\c\Documents
+call xcopy .\cdrive\sys\install\sisregistry \epoc32\winscw\c\sys\install\sisregistry /S /Y > NUL
+call xcopy .\cdrive\Documents \epoc32\winscw\c\Documents /S /Y > NUL
+if exist \epoc32\winscw\c\sys\install\sisregistry\backup.lst del \epoc32\winscw\c\sys\install\sisregistry\backup.lst > NUL
+
+ECHO ***ERRORCODE*** %errorlevel% PASS>>/epoc32/winscw/c/interpretsis_test_harness.txt
+GOTO END
+:LAST
+ECHO ***ERRORCODE*** %errorlevel% FAIL>>/epoc32/winscw/c/interpretsis_test_harness.txt
+:END
\ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/secureswitools/swisistools/test/tinterpretsisinteg/int_nr_option-02_db.bat Mon Mar 15 12:41:05 2010 +0200
@@ -0,0 +1,52 @@
+@rem
+@rem Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+@rem All rights reserved.
+@rem This component and the accompanying materials are made available
+@rem under the terms of the License "Eclipse Public License v1.0"
+@rem which accompanies this distribution, and is available
+@rem at the URL "http://www.eclipse.org/legal/sfl-v10.html".
+@rem
+@rem Initial Contributors:
+@rem Nokia Corporation - initial contribution.
+@rem
+@rem Contributors:
+@rem
+@rem Description:
+@rem
+@ECHO OFF
+REM int_nr_option_02
+REM int_nr_option_02 - Install a SIS file with NR CLI option set in parameter file. This is a positive testcase. Expected Result : SIS file is Installed.
+
+IF NOT EXIST .\backup\cdrive mkdir .\backup\cdrive > NUL
+IF NOT EXIST .\backup\romdrive mkdir .\backup\romdrive > NUL
+if not exist .\cdrive mkdir .\cdrive > NUL
+if not exist .\cdrive\Documents mkdir .\cdrive\Documents > NUL
+if not exist .\romdrive mkdir .\romdrive > NUL
+if not exist .\romdrive\system\ mkdir .\romdrive\system\ > NUL
+if not exist .\romdrive\system\install\ mkdir .\romdrive\system\install\ > NUL
+REM Remove installation files from any previous tests
+if exist .\cdrive\Documents\InstTest\Equivalent*.txt del .\cdrive\Documents\InstTest\Equivalent*.txt > NUL
+
+xcopy /E /Y backup\cdrive cdrive > NUL
+xcopy /E /Y backup\romdrive romdrive > NUL
+
+REM Remove installation files from any previous tests
+if exist \epoc32\winscw\c\Documents\abc*.txt del \epoc32\winscw\c\Documents\abc*.txt > NUL
+if exist \epoc32\winscw\c\sys\install\sisregistry\80000087\*.reg del \epoc32\winscw\c\sys\install\sisregistry\80000087\*.reg > NUL
+if exist \epoc32\winscw\c\sys\install\sisregistry\80000087\*.ctl del \epoc32\winscw\c\sys\install\sisregistry\80000087\*.ctl > NUL
+
+call interpretsis -p \epoc32\winscw\c\tswi\tinterpretsisinteg\parameters_file\int_nr_option_02_db.txt
+
+if not %errorlevel%==0 GOTO LAST
+if not exist \epoc32\winscw\c\Documents mkdir \epoc32\winscw\c\Documents
+call xcopy .\cdrive\Documents \epoc32\winscw\c\Documents /S /Y > NUL
+call xcopy .\cdrive\sys\install\sisregistry \epoc32\winscw\c\sys\install\sisregistry /S /Y > NUL
+if exist \epoc32\winscw\c\sys\install\scr\scr.db del \epoc32\winscw\c\sys\install\scr\scr.db > NUL
+copy .\romdrive\sys\install\scr\provisioned\scr.db \epoc32\winscw\c\sys\install\scr\scr.db /Y > NUL
+if exist \epoc32\winscw\c\sys\install\sisregistry\backup.lst del \epoc32\winscw\c\sys\install\sisregistry\backup.lst > NUL
+
+ECHO ***ERRORCODE*** %errorlevel% PASS>>/epoc32/winscw/c/interpretsis_test_harness_db.txt
+GOTO END
+:LAST
+ECHO ***ERRORCODE*** %errorlevel% FAIL>>/epoc32/winscw/c/interpretsis_test_harness_db.txt
+:END
\ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/secureswitools/swisistools/test/tinterpretsisinteg/int_nr_option-03.bat Mon Mar 15 12:41:05 2010 +0200
@@ -0,0 +1,49 @@
+@rem
+@rem Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+@rem All rights reserved.
+@rem This component and the accompanying materials are made available
+@rem under the terms of the License "Eclipse Public License v1.0"
+@rem which accompanies this distribution, and is available
+@rem at the URL "http://www.eclipse.org/legal/sfl-v10.html".
+@rem
+@rem Initial Contributors:
+@rem Nokia Corporation - initial contribution.
+@rem
+@rem Contributors:
+@rem
+@rem Description:
+@rem
+@ECHO OFF
+REM int_nr_option_03
+REM int_nr_option_03 - Install a SIS file (SA) without NR CLI option set. then install PU for the same SIS file with NR CLI option set. This is a positive testcase. Expected Result : SIS files (SA and PU) are Installed.
+
+IF NOT EXIST .\backup\cdrive mkdir .\backup\cdrive > NUL
+IF NOT EXIST .\backup\romdrive mkdir .\backup\romdrive > NUL
+if not exist .\cdrive mkdir .\cdrive > NUL
+if not exist .\cdrive\Documents mkdir .\cdrive\Documents > NUL
+if not exist .\romdrive mkdir .\romdrive > NUL
+if not exist .\romdrive\system\ mkdir .\romdrive\system\ > NUL
+if not exist .\romdrive\system\install\ mkdir .\romdrive\system\install\ > NUL
+
+xcopy /E /Y backup\cdrive cdrive > NUL
+xcopy /E /Y backup\romdrive romdrive > NUL
+
+REM Remove installation files from any previous tests
+if exist \epoc32\winscw\c\Documents\abc*.txt del \epoc32\winscw\c\Documents\abc*.txt > NUL
+if exist \epoc32\winscw\c\sys\install\sisregistry\80000086\*.reg del \epoc32\winscw\c\sys\install\sisregistry\80000086\*.reg > NUL
+if exist \epoc32\winscw\c\sys\install\sisregistry\80000086\*.ctl del \epoc32\winscw\c\sys\install\sisregistry\80000086\*.ctl > NUL
+
+call interpretsis -z .\romdrive -c .\cdrive -s \epoc32\winscw\c\tswi\tsis\data\int_nr_option_01.sis -w info -l /epoc32/winscw/c/interpretsis_test_harness.txt > NUL
+call interpretsis -z .\romdrive -c .\cdrive -s \epoc32\winscw\c\tswi\tsis\data\pu_int_nr_option_01.sis +nonremovablepkg -w info -l /epoc32/winscw/c/interpretsis_test_harness.txt > NUL
+
+if not %errorlevel%==0 GOTO LAST
+if not exist \epoc32\winscw\c\Documents mkdir \epoc32\winscw\c\Documents
+call xcopy .\cdrive\sys\install\sisregistry \epoc32\winscw\c\sys\install\sisregistry /S /Y > NUL
+call xcopy .\cdrive\Documents \epoc32\winscw\c\Documents /S /Y > NUL
+if exist \epoc32\winscw\c\sys\install\sisregistry\backup.lst del \epoc32\winscw\c\sys\install\sisregistry\backup.lst > NUL
+
+ECHO ***ERRORCODE*** %errorlevel% PASS>>/epoc32/winscw/c/interpretsis_test_harness.txt
+GOTO END
+:LAST
+ECHO ***ERRORCODE*** %errorlevel% FAIL>>/epoc32/winscw/c/interpretsis_test_harness.txt
+:END
\ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/secureswitools/swisistools/test/tinterpretsisinteg/int_nr_option-03_db.bat Mon Mar 15 12:41:05 2010 +0200
@@ -0,0 +1,53 @@
+@rem
+@rem Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+@rem All rights reserved.
+@rem This component and the accompanying materials are made available
+@rem under the terms of the License "Eclipse Public License v1.0"
+@rem which accompanies this distribution, and is available
+@rem at the URL "http://www.eclipse.org/legal/sfl-v10.html".
+@rem
+@rem Initial Contributors:
+@rem Nokia Corporation - initial contribution.
+@rem
+@rem Contributors:
+@rem
+@rem Description:
+@rem
+@ECHO OFF
+REM int_nr_option_03
+REM int_nr_option_03 - Install a SIS file (SA) without NR CLI option set. then install PU for the same SIS file with NR CLI option set. This is a positive testcase. Expected Result : SIS files (SA and PU) are Installed.
+
+IF NOT EXIST .\backup\cdrive mkdir .\backup\cdrive > NUL
+IF NOT EXIST .\backup\romdrive mkdir .\backup\romdrive > NUL
+if not exist .\cdrive mkdir .\cdrive > NUL
+if not exist .\cdrive\Documents mkdir .\cdrive\Documents > NUL
+if not exist .\romdrive mkdir .\romdrive > NUL
+if not exist .\romdrive\system\ mkdir .\romdrive\system\ > NUL
+if not exist .\romdrive\system\install\ mkdir .\romdrive\system\install\ > NUL
+REM Remove installation files from any previous tests
+if exist .\cdrive\Documents\InstTest\Equivalent*.txt del .\cdrive\Documents\InstTest\Equivalent*.txt > NUL
+
+xcopy /E /Y backup\cdrive cdrive > NUL
+xcopy /E /Y backup\romdrive romdrive > NUL
+
+REM Remove installation files from any previous tests
+if exist \epoc32\winscw\c\Documents\abc*.txt del \epoc32\winscw\c\Documents\abc*.txt > NUL
+if exist \epoc32\winscw\c\sys\install\sisregistry\80000086\*.reg del \epoc32\winscw\c\sys\install\sisregistry\80000086\*.reg > NUL
+if exist \epoc32\winscw\c\sys\install\sisregistry\80000086\*.ctl del \epoc32\winscw\c\sys\install\sisregistry\80000086\*.ctl > NUL
+
+call interpretsis -z .\romdrive -c .\cdrive -s \epoc32\winscw\c\tswi\tsis\data\int_nr_option_01.sis -w info -l /epoc32/winscw/c/interpretsis_test_harness_db.txt > NUL
+call interpretsis -z .\romdrive -c .\cdrive -s \epoc32\winscw\c\tswi\tsis\data\pu_int_nr_option_01.sis +nonremovablepkg -w info -l /epoc32/winscw/c/interpretsis_test_harness_db.txt > NUL
+
+if not %errorlevel%==0 GOTO LAST
+if not exist \epoc32\winscw\c\Documents mkdir \epoc32\winscw\c\Documents
+call xcopy .\cdrive\Documents \epoc32\winscw\c\Documents /S /Y > NUL
+call xcopy .\cdrive\sys\install\sisregistry \epoc32\winscw\c\sys\install\sisregistry /S /Y > NUL
+if exist \epoc32\winscw\c\sys\install\scr\scr.db del \epoc32\winscw\c\sys\install\scr\scr.db > NUL
+copy .\romdrive\sys\install\scr\provisioned\scr.db \epoc32\winscw\c\sys\install\scr\scr.db /Y > NUL
+if exist \epoc32\winscw\c\sys\install\sisregistry\backup.lst del \epoc32\winscw\c\sys\install\sisregistry\backup.lst > NUL
+
+ECHO ***ERRORCODE*** %errorlevel% PASS>>/epoc32/winscw/c/interpretsis_test_harness_db.txt
+GOTO END
+:LAST
+ECHO ***ERRORCODE*** %errorlevel% FAIL>>/epoc32/winscw/c/interpretsis_test_harness_db.txt
+:END
\ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/secureswitools/swisistools/test/tinterpretsisinteg/int_nr_option-04.bat Mon Mar 15 12:41:05 2010 +0200
@@ -0,0 +1,49 @@
+@rem
+@rem Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+@rem All rights reserved.
+@rem This component and the accompanying materials are made available
+@rem under the terms of the License "Eclipse Public License v1.0"
+@rem which accompanies this distribution, and is available
+@rem at the URL "http://www.eclipse.org/legal/sfl-v10.html".
+@rem
+@rem Initial Contributors:
+@rem Nokia Corporation - initial contribution.
+@rem
+@rem Contributors:
+@rem
+@rem Description:
+@rem
+@ECHO OFF
+REM int_nr_option_04
+REM int_nr_option_04 - Install a SIS file (SA) without NR CLI option set. then install SP for the same SIS file with NR CLI option set. This is a negative testcase. Expected Result : SP is not installed.
+
+IF NOT EXIST .\backup\cdrive mkdir .\backup\cdrive > NUL
+IF NOT EXIST .\backup\romdrive mkdir .\backup\romdrive > NUL
+if not exist .\cdrive mkdir .\cdrive > NUL
+if not exist .\cdrive\Documents mkdir .\cdrive\Documents > NUL
+if not exist .\romdrive mkdir .\romdrive > NUL
+if not exist .\romdrive\system\ mkdir .\romdrive\system\ > NUL
+if not exist .\romdrive\system\install\ mkdir .\romdrive\system\install\ > NUL
+
+xcopy /E /Y backup\cdrive cdrive > NUL
+xcopy /E /Y backup\romdrive romdrive > NUL
+
+REM Remove installation files from any previous tests
+if exist \epoc32\winscw\c\Documents\abc*.txt del \epoc32\winscw\c\Documents\abc*.txt > NUL
+if exist \epoc32\winscw\c\sys\install\sisregistry\80000086\*.reg del \epoc32\winscw\c\sys\install\sisregistry\80000086\*.reg > NUL
+if exist \epoc32\winscw\c\sys\install\sisregistry\80000086\*.ctl del \epoc32\winscw\c\sys\install\sisregistry\80000086\*.ctl > NUL
+
+call interpretsis -z .\romdrive -c .\cdrive -s \epoc32\winscw\c\tswi\tsis\data\int_nr_option_01.sis -w info -l /epoc32/winscw/c/interpretsis_test_harness.txt > NUL
+call interpretsis -z .\romdrive -c .\cdrive -s \epoc32\winscw\c\tswi\tsis\data\sp_int_nr_option_01.sis +nonremovablepkg -w info -l /epoc32/winscw/c/interpretsis_test_harness.txt > NUL
+
+if not %errorlevel%==0 GOTO LAST
+if not exist \epoc32\winscw\c\Documents mkdir \epoc32\winscw\c\Documents
+call xcopy .\cdrive\sys\install\sisregistry \epoc32\winscw\c\sys\install\sisregistry /S /Y > NUL
+call xcopy .\cdrive\Documents \epoc32\winscw\c\Documents /S /Y > NUL
+if exist \epoc32\winscw\c\sys\install\sisregistry\backup.lst del \epoc32\winscw\c\sys\install\sisregistry\backup.lst > NUL
+
+ECHO ***ERRORCODE*** %errorlevel% PASS>>/epoc32/winscw/c/interpretsis_test_harness.txt
+GOTO END
+:LAST
+ECHO ***ERRORCODE*** %errorlevel% FAIL>>/epoc32/winscw/c/interpretsis_test_harness.txt
+:END
\ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/secureswitools/swisistools/test/tinterpretsisinteg/int_nr_option-04_db.bat Mon Mar 15 12:41:05 2010 +0200
@@ -0,0 +1,53 @@
+@rem
+@rem Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+@rem All rights reserved.
+@rem This component and the accompanying materials are made available
+@rem under the terms of the License "Eclipse Public License v1.0"
+@rem which accompanies this distribution, and is available
+@rem at the URL "http://www.eclipse.org/legal/sfl-v10.html".
+@rem
+@rem Initial Contributors:
+@rem Nokia Corporation - initial contribution.
+@rem
+@rem Contributors:
+@rem
+@rem Description:
+@rem
+@ECHO OFF
+REM int_nr_option_04
+REM int_nr_option_04 - Install a SIS file (SA) without NR CLI option set. then install SP for the same SIS file with NR CLI option set. This is a negative testcase. Expected Result : SP is not installed.
+
+IF NOT EXIST .\backup\cdrive mkdir .\backup\cdrive > NUL
+IF NOT EXIST .\backup\romdrive mkdir .\backup\romdrive > NUL
+if not exist .\cdrive mkdir .\cdrive > NUL
+if not exist .\cdrive\Documents mkdir .\cdrive\Documents > NUL
+if not exist .\romdrive mkdir .\romdrive > NUL
+if not exist .\romdrive\system\ mkdir .\romdrive\system\ > NUL
+if not exist .\romdrive\system\install\ mkdir .\romdrive\system\install\ > NUL
+REM Remove installation files from any previous tests
+if exist .\cdrive\Documents\InstTest\Equivalent*.txt del .\cdrive\Documents\InstTest\Equivalent*.txt > NUL
+
+xcopy /E /Y backup\cdrive cdrive > NUL
+xcopy /E /Y backup\romdrive romdrive > NUL
+
+REM Remove installation files from any previous tests
+if exist \epoc32\winscw\c\Documents\abc*.txt del \epoc32\winscw\c\Documents\abc*.txt > NUL
+if exist \epoc32\winscw\c\sys\install\sisregistry\80000086\*.reg del \epoc32\winscw\c\sys\install\sisregistry\80000086\*.reg > NUL
+if exist \epoc32\winscw\c\sys\install\sisregistry\80000086\*.ctl del \epoc32\winscw\c\sys\install\sisregistry\80000086\*.ctl > NUL
+
+call interpretsis -z .\romdrive -c .\cdrive -s \epoc32\winscw\c\tswi\tsis\data\int_nr_option_01.sis -w info -l /epoc32/winscw/c/interpretsis_test_harness_db.txt > NUL
+call interpretsis -z .\romdrive -c .\cdrive -s \epoc32\winscw\c\tswi\tsis\data\sp_int_nr_option_01.sis +nonremovablepkg -w info -l /epoc32/winscw/c/interpretsis_test_harness_db.txt > NUL
+
+if not %errorlevel%==0 GOTO LAST
+if not exist \epoc32\winscw\c\Documents mkdir \epoc32\winscw\c\Documents
+call xcopy .\cdrive\Documents \epoc32\winscw\c\Documents /S /Y > NUL
+call xcopy .\cdrive\sys\install\sisregistry \epoc32\winscw\c\sys\install\sisregistry /S /Y > NUL
+if exist \epoc32\winscw\c\sys\install\scr\scr.db del \epoc32\winscw\c\sys\install\scr\scr.db > NUL
+copy .\romdrive\sys\install\scr\provisioned\scr.db \epoc32\winscw\c\sys\install\scr\scr.db /Y > NUL
+if exist \epoc32\winscw\c\sys\install\sisregistry\backup.lst del \epoc32\winscw\c\sys\install\sisregistry\backup.lst > NUL
+
+ECHO ***ERRORCODE*** %errorlevel% PASS>>/epoc32/winscw/c/interpretsis_test_harness_db.txt
+GOTO END
+:LAST
+ECHO ***ERRORCODE*** %errorlevel% FAIL>>/epoc32/winscw/c/interpretsis_test_harness_db.txt
+:END
\ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/secureswitools/swisistools/test/tinterpretsisinteg/int_nr_option-05.bat Mon Mar 15 12:41:05 2010 +0200
@@ -0,0 +1,49 @@
+@rem
+@rem Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+@rem All rights reserved.
+@rem This component and the accompanying materials are made available
+@rem under the terms of the License "Eclipse Public License v1.0"
+@rem which accompanies this distribution, and is available
+@rem at the URL "http://www.eclipse.org/legal/sfl-v10.html".
+@rem
+@rem Initial Contributors:
+@rem Nokia Corporation - initial contribution.
+@rem
+@rem Contributors:
+@rem
+@rem Description:
+@rem
+@ECHO OFF
+REM int_nr_option_05
+REM int_nr_option_05 - Install a SIS file without NR CLI option set (SA over SA). This is a positive testcase. Expected Result : SIS file is Installed.
+
+IF NOT EXIST .\backup\cdrive mkdir .\backup\cdrive > NUL
+IF NOT EXIST .\backup\romdrive mkdir .\backup\romdrive > NUL
+if not exist .\cdrive mkdir .\cdrive > NUL
+if not exist .\cdrive\Documents mkdir .\cdrive\Documents > NUL
+if not exist .\romdrive mkdir .\romdrive > NUL
+if not exist .\romdrive\system\ mkdir .\romdrive\system\ > NUL
+if not exist .\romdrive\system\install\ mkdir .\romdrive\system\install\ > NUL
+
+xcopy /E /Y backup\cdrive cdrive > NUL
+xcopy /E /Y backup\romdrive romdrive > NUL
+
+REM Remove installation files from any previous tests
+if exist \epoc32\winscw\c\Documents\abc*.txt del \epoc32\winscw\c\Documents\abc*.txt > NUL
+if exist \epoc32\winscw\c\sys\install\sisregistry\80000086\*.reg del \epoc32\winscw\c\sys\install\sisregistry\80000086\*.reg > NUL
+if exist \epoc32\winscw\c\sys\install\sisregistry\80000086\*.ctl del \epoc32\winscw\c\sys\install\sisregistry\80000086\*.ctl > NUL
+
+call interpretsis -z .\romdrive -c .\cdrive -s \epoc32\winscw\c\tswi\tsis\data\int_nr_option_01.sis -w info -l /epoc32/winscw/c/interpretsis_test_harness.txt > NUL
+call interpretsis -z .\romdrive -c .\cdrive -s \epoc32\winscw\c\tswi\tsis\data\int_nr_option_01.sis -w info -l /epoc32/winscw/c/interpretsis_test_harness.txt > NUL
+
+if not %errorlevel%==0 GOTO LAST
+if not exist \epoc32\winscw\c\Documents mkdir \epoc32\winscw\c\Documents
+call xcopy .\cdrive\sys\install\sisregistry \epoc32\winscw\c\sys\install\sisregistry /S /Y > NUL
+call xcopy .\cdrive\Documents \epoc32\winscw\c\Documents /S /Y > NUL
+if exist \epoc32\winscw\c\sys\install\sisregistry\backup.lst del \epoc32\winscw\c\sys\install\sisregistry\backup.lst > NUL
+
+ECHO ***ERRORCODE*** %errorlevel% PASS>>/epoc32/winscw/c/interpretsis_test_harness.txt
+GOTO END
+:LAST
+ECHO ***ERRORCODE*** %errorlevel% FAIL>>/epoc32/winscw/c/interpretsis_test_harness.txt
+:END
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/secureswitools/swisistools/test/tinterpretsisinteg/int_nr_option-05_db.bat Mon Mar 15 12:41:05 2010 +0200
@@ -0,0 +1,53 @@
+@rem
+@rem Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+@rem All rights reserved.
+@rem This component and the accompanying materials are made available
+@rem under the terms of the License "Eclipse Public License v1.0"
+@rem which accompanies this distribution, and is available
+@rem at the URL "http://www.eclipse.org/legal/sfl-v10.html".
+@rem
+@rem Initial Contributors:
+@rem Nokia Corporation - initial contribution.
+@rem
+@rem Contributors:
+@rem
+@rem Description:
+@rem
+@ECHO OFF
+REM int_nr_option_05
+REM int_nr_option_05 - Install a SIS file without NR CLI option set (SA over SA). This is a positive testcase. Expected Result : SIS file is Installed.
+
+IF NOT EXIST .\backup\cdrive mkdir .\backup\cdrive > NUL
+IF NOT EXIST .\backup\romdrive mkdir .\backup\romdrive > NUL
+if not exist .\cdrive mkdir .\cdrive > NUL
+if not exist .\cdrive\Documents mkdir .\cdrive\Documents > NUL
+if not exist .\romdrive mkdir .\romdrive > NUL
+if not exist .\romdrive\system\ mkdir .\romdrive\system\ > NUL
+if not exist .\romdrive\system\install\ mkdir .\romdrive\system\install\ > NUL
+REM Remove installation files from any previous tests
+if exist .\cdrive\Documents\InstTest\Equivalent*.txt del .\cdrive\Documents\InstTest\Equivalent*.txt > NUL
+
+xcopy /E /Y backup\cdrive cdrive > NUL
+xcopy /E /Y backup\romdrive romdrive > NUL
+
+REM Remove installation files from any previous tests
+if exist \epoc32\winscw\c\Documents\abc*.txt del \epoc32\winscw\c\Documents\abc*.txt > NUL
+if exist \epoc32\winscw\c\sys\install\sisregistry\80000086\*.reg del \epoc32\winscw\c\sys\install\sisregistry\80000086\*.reg > NUL
+if exist \epoc32\winscw\c\sys\install\sisregistry\80000086\*.ctl del \epoc32\winscw\c\sys\install\sisregistry\80000086\*.ctl > NUL
+
+call interpretsis -z .\romdrive -c .\cdrive -s \epoc32\winscw\c\tswi\tsis\data\int_nr_option_01.sis -w info -l /epoc32/winscw/c/interpretsis_test_harness_db.txt > NUL
+call interpretsis -z .\romdrive -c .\cdrive -s \epoc32\winscw\c\tswi\tsis\data\int_nr_option_01.sis -w info -l /epoc32/winscw/c/interpretsis_test_harness_db.txt > NUL
+
+if not %errorlevel%==0 GOTO LAST
+if not exist \epoc32\winscw\c\Documents mkdir \epoc32\winscw\c\Documents
+call xcopy .\cdrive\Documents \epoc32\winscw\c\Documents /S /Y > NUL
+call xcopy .\cdrive\sys\install\sisregistry \epoc32\winscw\c\sys\install\sisregistry /S /Y > NUL
+if exist \epoc32\winscw\c\sys\install\scr\scr.db del \epoc32\winscw\c\sys\install\scr\scr.db > NUL
+copy .\romdrive\sys\install\scr\provisioned\scr.db \epoc32\winscw\c\sys\install\scr\scr.db /Y > NUL
+if exist \epoc32\winscw\c\sys\install\sisregistry\backup.lst del \epoc32\winscw\c\sys\install\sisregistry\backup.lst > NUL
+
+ECHO ***ERRORCODE*** %errorlevel% PASS>>/epoc32/winscw/c/interpretsis_test_harness_db.txt
+GOTO END
+:LAST
+ECHO ***ERRORCODE*** %errorlevel% FAIL>>/epoc32/winscw/c/interpretsis_test_harness_db.txt
+:END
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/secureswitools/swisistools/test/tinterpretsisinteg/int_nr_option-06.bat Mon Mar 15 12:41:05 2010 +0200
@@ -0,0 +1,49 @@
+@rem
+@rem Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+@rem All rights reserved.
+@rem This component and the accompanying materials are made available
+@rem under the terms of the License "Eclipse Public License v1.0"
+@rem which accompanies this distribution, and is available
+@rem at the URL "http://www.eclipse.org/legal/sfl-v10.html".
+@rem
+@rem Initial Contributors:
+@rem Nokia Corporation - initial contribution.
+@rem
+@rem Contributors:
+@rem
+@rem Description:
+@rem
+@ECHO OFF
+REM int_nr_option_06
+REM int_nr_option_06 - SA over SA(NR). This is a positive testcase. Expected Result : SIS file is Installed.
+
+IF NOT EXIST .\backup\cdrive mkdir .\backup\cdrive > NUL
+IF NOT EXIST .\backup\romdrive mkdir .\backup\romdrive > NUL
+if not exist .\cdrive mkdir .\cdrive > NUL
+if not exist .\cdrive\Documents mkdir .\cdrive\Documents > NUL
+if not exist .\romdrive mkdir .\romdrive > NUL
+if not exist .\romdrive\system\ mkdir .\romdrive\system\ > NUL
+if not exist .\romdrive\system\install\ mkdir .\romdrive\system\install\ > NUL
+
+xcopy /E /Y backup\cdrive cdrive > NUL
+xcopy /E /Y backup\romdrive romdrive > NUL
+
+REM Remove installation files from any previous tests
+if exist \epoc32\winscw\c\Documents\abc*.txt del \epoc32\winscw\c\Documents\abc*.txt > NUL
+if exist \epoc32\winscw\c\sys\install\sisregistry\80000086\*.reg del \epoc32\winscw\c\sys\install\sisregistry\80000086\*.reg > NUL
+if exist \epoc32\winscw\c\sys\install\sisregistry\80000086\*.ctl del \epoc32\winscw\c\sys\install\sisregistry\80000086\*.ctl > NUL
+
+call interpretsis -z .\romdrive -c .\cdrive -s \epoc32\winscw\c\tswi\tsis\data\int_nr_option_01.sis +nonremovablepkg -w info -l /epoc32/winscw/c/interpretsis_test_harness.txt > NUL
+call interpretsis -z .\romdrive -c .\cdrive -s \epoc32\winscw\c\tswi\tsis\data\int_nr_option_01.sis -w info -l /epoc32/winscw/c/interpretsis_test_harness.txt > NUL
+
+if not %errorlevel%==0 GOTO LAST
+if not exist \epoc32\winscw\c\Documents mkdir \epoc32\winscw\c\Documents
+call xcopy .\cdrive\sys\install\sisregistry \epoc32\winscw\c\sys\install\sisregistry /S /Y > NUL
+call xcopy .\cdrive\Documents \epoc32\winscw\c\Documents /S /Y > NUL
+if exist \epoc32\winscw\c\sys\install\sisregistry\backup.lst del \epoc32\winscw\c\sys\install\sisregistry\backup.lst > NUL
+
+ECHO ***ERRORCODE*** %errorlevel% PASS>>/epoc32/winscw/c/interpretsis_test_harness.txt
+GOTO END
+:LAST
+ECHO ***ERRORCODE*** %errorlevel% FAIL>>/epoc32/winscw/c/interpretsis_test_harness.txt
+:END
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/secureswitools/swisistools/test/tinterpretsisinteg/int_nr_option-06_db.bat Mon Mar 15 12:41:05 2010 +0200
@@ -0,0 +1,53 @@
+@rem
+@rem Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+@rem All rights reserved.
+@rem This component and the accompanying materials are made available
+@rem under the terms of the License "Eclipse Public License v1.0"
+@rem which accompanies this distribution, and is available
+@rem at the URL "http://www.eclipse.org/legal/sfl-v10.html".
+@rem
+@rem Initial Contributors:
+@rem Nokia Corporation - initial contribution.
+@rem
+@rem Contributors:
+@rem
+@rem Description:
+@rem
+@ECHO OFF
+REM int_nr_option_06
+REM int_nr_option_06 - SA over SA(NR). This is a positive testcase. Expected Result : SIS file is Installed.
+
+IF NOT EXIST .\backup\cdrive mkdir .\backup\cdrive > NUL
+IF NOT EXIST .\backup\romdrive mkdir .\backup\romdrive > NUL
+if not exist .\cdrive mkdir .\cdrive > NUL
+if not exist .\cdrive\Documents mkdir .\cdrive\Documents > NUL
+if not exist .\romdrive mkdir .\romdrive > NUL
+if not exist .\romdrive\system\ mkdir .\romdrive\system\ > NUL
+if not exist .\romdrive\system\install\ mkdir .\romdrive\system\install\ > NUL
+REM Remove installation files from any previous tests
+if exist .\cdrive\Documents\InstTest\Equivalent*.txt del .\cdrive\Documents\InstTest\Equivalent*.txt > NUL
+
+xcopy /E /Y backup\cdrive cdrive > NUL
+xcopy /E /Y backup\romdrive romdrive > NUL
+
+REM Remove installation files from any previous tests
+if exist \epoc32\winscw\c\Documents\abc*.txt del \epoc32\winscw\c\Documents\abc*.txt > NUL
+if exist \epoc32\winscw\c\sys\install\sisregistry\80000086\*.reg del \epoc32\winscw\c\sys\install\sisregistry\80000086\*.reg > NUL
+if exist \epoc32\winscw\c\sys\install\sisregistry\80000086\*.ctl del \epoc32\winscw\c\sys\install\sisregistry\80000086\*.ctl > NUL
+
+call interpretsis -z .\romdrive -c .\cdrive -s \epoc32\winscw\c\tswi\tsis\data\int_nr_option_01.sis +nonremovablepkg -w info -l /epoc32/winscw/c/interpretsis_test_harness_db.txt > NUL
+call interpretsis -z .\romdrive -c .\cdrive -s \epoc32\winscw\c\tswi\tsis\data\int_nr_option_01.sis -w info -l /epoc32/winscw/c/interpretsis_test_harness_db.txt > NUL
+
+if not %errorlevel%==0 GOTO LAST
+if not exist \epoc32\winscw\c\Documents mkdir \epoc32\winscw\c\Documents
+call xcopy .\cdrive\Documents \epoc32\winscw\c\Documents /S /Y > NUL
+call xcopy .\cdrive\sys\install\sisregistry \epoc32\winscw\c\sys\install\sisregistry /S /Y > NUL
+if exist \epoc32\winscw\c\sys\install\scr\scr.db del \epoc32\winscw\c\sys\install\scr\scr.db > NUL
+copy .\romdrive\sys\install\scr\provisioned\scr.db \epoc32\winscw\c\sys\install\scr\scr.db /Y > NUL
+if exist \epoc32\winscw\c\sys\install\sisregistry\backup.lst del \epoc32\winscw\c\sys\install\sisregistry\backup.lst > NUL
+
+ECHO ***ERRORCODE*** %errorlevel% PASS>>/epoc32/winscw/c/interpretsis_test_harness_db.txt
+GOTO END
+:LAST
+ECHO ***ERRORCODE*** %errorlevel% FAIL>>/epoc32/winscw/c/interpretsis_test_harness_db.txt
+:END
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/secureswitools/swisistools/test/tinterpretsisinteg/int_nr_option-07.bat Mon Mar 15 12:41:05 2010 +0200
@@ -0,0 +1,49 @@
+@rem
+@rem Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+@rem All rights reserved.
+@rem This component and the accompanying materials are made available
+@rem under the terms of the License "Eclipse Public License v1.0"
+@rem which accompanies this distribution, and is available
+@rem at the URL "http://www.eclipse.org/legal/sfl-v10.html".
+@rem
+@rem Initial Contributors:
+@rem Nokia Corporation - initial contribution.
+@rem
+@rem Contributors:
+@rem
+@rem Description:
+@rem
+@ECHO OFF
+REM int_nr_option_07
+REM int_nr_option_07 - SA(NR) over SA(NR). This is a positive testcase. Expected Result : SIS file is Installed.
+
+IF NOT EXIST .\backup\cdrive mkdir .\backup\cdrive > NUL
+IF NOT EXIST .\backup\romdrive mkdir .\backup\romdrive > NUL
+if not exist .\cdrive mkdir .\cdrive > NUL
+if not exist .\cdrive\Documents mkdir .\cdrive\Documents > NUL
+if not exist .\romdrive mkdir .\romdrive > NUL
+if not exist .\romdrive\system\ mkdir .\romdrive\system\ > NUL
+if not exist .\romdrive\system\install\ mkdir .\romdrive\system\install\ > NUL
+
+xcopy /E /Y backup\cdrive cdrive > NUL
+xcopy /E /Y backup\romdrive romdrive > NUL
+
+REM Remove installation files from any previous tests
+if exist \epoc32\winscw\c\Documents\abc*.txt del \epoc32\winscw\c\Documents\abc*.txt > NUL
+if exist \epoc32\winscw\c\sys\install\sisregistry\80000086\*.reg del \epoc32\winscw\c\sys\install\sisregistry\80000086\*.reg > NUL
+if exist \epoc32\winscw\c\sys\install\sisregistry\80000086\*.ctl del \epoc32\winscw\c\sys\install\sisregistry\80000086\*.ctl > NUL
+
+call interpretsis -z .\romdrive -c .\cdrive -s \epoc32\winscw\c\tswi\tsis\data\int_nr_option_01.sis +nonremovablepkg -w info -l /epoc32/winscw/c/interpretsis_test_harness.txt > NUL
+call interpretsis -z .\romdrive -c .\cdrive -s \epoc32\winscw\c\tswi\tsis\data\int_nr_option_01.sis +nonremovablepkg -w info -l /epoc32/winscw/c/interpretsis_test_harness.txt > NUL
+
+if not %errorlevel%==0 GOTO LAST
+if not exist \epoc32\winscw\c\Documents mkdir \epoc32\winscw\c\Documents
+call xcopy .\cdrive\sys\install\sisregistry \epoc32\winscw\c\sys\install\sisregistry /S /Y > NUL
+call xcopy .\cdrive\Documents \epoc32\winscw\c\Documents /S /Y > NUL
+if exist \epoc32\winscw\c\sys\install\sisregistry\backup.lst del \epoc32\winscw\c\sys\install\sisregistry\backup.lst > NUL
+
+ECHO ***ERRORCODE*** %errorlevel% PASS>>/epoc32/winscw/c/interpretsis_test_harness.txt
+GOTO END
+:LAST
+ECHO ***ERRORCODE*** %errorlevel% FAIL>>/epoc32/winscw/c/interpretsis_test_harness.txt
+:END
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/secureswitools/swisistools/test/tinterpretsisinteg/int_nr_option-07_db.bat Mon Mar 15 12:41:05 2010 +0200
@@ -0,0 +1,53 @@
+@rem
+@rem Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+@rem All rights reserved.
+@rem This component and the accompanying materials are made available
+@rem under the terms of the License "Eclipse Public License v1.0"
+@rem which accompanies this distribution, and is available
+@rem at the URL "http://www.eclipse.org/legal/sfl-v10.html".
+@rem
+@rem Initial Contributors:
+@rem Nokia Corporation - initial contribution.
+@rem
+@rem Contributors:
+@rem
+@rem Description:
+@rem
+@ECHO OFF
+REM int_nr_option_07
+REM int_nr_option_07 - SA(NR) over SA(NR). This is a positive testcase. Expected Result : SIS file is Installed.
+
+IF NOT EXIST .\backup\cdrive mkdir .\backup\cdrive > NUL
+IF NOT EXIST .\backup\romdrive mkdir .\backup\romdrive > NUL
+if not exist .\cdrive mkdir .\cdrive > NUL
+if not exist .\cdrive\Documents mkdir .\cdrive\Documents > NUL
+if not exist .\romdrive mkdir .\romdrive > NUL
+if not exist .\romdrive\system\ mkdir .\romdrive\system\ > NUL
+if not exist .\romdrive\system\install\ mkdir .\romdrive\system\install\ > NUL
+REM Remove installation files from any previous tests
+if exist .\cdrive\Documents\InstTest\Equivalent*.txt del .\cdrive\Documents\InstTest\Equivalent*.txt > NUL
+
+xcopy /E /Y backup\cdrive cdrive > NUL
+xcopy /E /Y backup\romdrive romdrive > NUL
+
+REM Remove installation files from any previous tests
+if exist \epoc32\winscw\c\Documents\abc*.txt del \epoc32\winscw\c\Documents\abc*.txt > NUL
+if exist \epoc32\winscw\c\sys\install\sisregistry\80000086\*.reg del \epoc32\winscw\c\sys\install\sisregistry\80000086\*.reg > NUL
+if exist \epoc32\winscw\c\sys\install\sisregistry\80000086\*.ctl del \epoc32\winscw\c\sys\install\sisregistry\80000086\*.ctl > NUL
+
+call interpretsis -z .\romdrive -c .\cdrive -s \epoc32\winscw\c\tswi\tsis\data\int_nr_option_01.sis +nonremovablepkg -w info -l /epoc32/winscw/c/interpretsis_test_harness_db.txt > NUL
+call interpretsis -z .\romdrive -c .\cdrive -s \epoc32\winscw\c\tswi\tsis\data\int_nr_option_01.sis +nonremovablepkg -w info -l /epoc32/winscw/c/interpretsis_test_harness_db.txt > NUL
+
+if not %errorlevel%==0 GOTO LAST
+if not exist \epoc32\winscw\c\Documents mkdir \epoc32\winscw\c\Documents
+call xcopy .\cdrive\Documents \epoc32\winscw\c\Documents /S /Y > NUL
+call xcopy .\cdrive\sys\install\sisregistry \epoc32\winscw\c\sys\install\sisregistry /S /Y > NUL
+if exist \epoc32\winscw\c\sys\install\scr\scr.db del \epoc32\winscw\c\sys\install\scr\scr.db > NUL
+copy .\romdrive\sys\install\scr\provisioned\scr.db \epoc32\winscw\c\sys\install\scr\scr.db /Y > NUL
+if exist \epoc32\winscw\c\sys\install\sisregistry\backup.lst del \epoc32\winscw\c\sys\install\sisregistry\backup.lst > NUL
+
+ECHO ***ERRORCODE*** %errorlevel% PASS>>/epoc32/winscw/c/interpretsis_test_harness_db.txt
+GOTO END
+:LAST
+ECHO ***ERRORCODE*** %errorlevel% FAIL>>/epoc32/winscw/c/interpretsis_test_harness_db.txt
+:END
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/secureswitools/swisistools/test/tinterpretsisinteg/int_nr_option-08.bat Mon Mar 15 12:41:05 2010 +0200
@@ -0,0 +1,49 @@
+@rem
+@rem Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+@rem All rights reserved.
+@rem This component and the accompanying materials are made available
+@rem under the terms of the License "Eclipse Public License v1.0"
+@rem which accompanies this distribution, and is available
+@rem at the URL "http://www.eclipse.org/legal/sfl-v10.html".
+@rem
+@rem Initial Contributors:
+@rem Nokia Corporation - initial contribution.
+@rem
+@rem Contributors:
+@rem
+@rem Description:
+@rem
+@ECHO OFF
+REM int_nr_option_08
+REM int_nr_option_08 - SP over SA. This is a positive testcase. Expected Result : SIS file is Installed.
+
+IF NOT EXIST .\backup\cdrive mkdir .\backup\cdrive > NUL
+IF NOT EXIST .\backup\romdrive mkdir .\backup\romdrive > NUL
+if not exist .\cdrive mkdir .\cdrive > NUL
+if not exist .\cdrive\Documents mkdir .\cdrive\Documents > NUL
+if not exist .\romdrive mkdir .\romdrive > NUL
+if not exist .\romdrive\system\ mkdir .\romdrive\system\ > NUL
+if not exist .\romdrive\system\install\ mkdir .\romdrive\system\install\ > NUL
+
+xcopy /E /Y backup\cdrive cdrive > NUL
+xcopy /E /Y backup\romdrive romdrive > NUL
+
+REM Remove installation files from any previous tests
+if exist \epoc32\winscw\c\Documents\abc*.txt del \epoc32\winscw\c\Documents\abc*.txt > NUL
+if exist \epoc32\winscw\c\sys\install\sisregistry\80000086\*.reg del \epoc32\winscw\c\sys\install\sisregistry\80000086\*.reg > NUL
+if exist \epoc32\winscw\c\sys\install\sisregistry\80000086\*.ctl del \epoc32\winscw\c\sys\install\sisregistry\80000086\*.ctl > NUL
+
+call interpretsis -z .\romdrive -c .\cdrive -s \epoc32\winscw\c\tswi\tsis\data\int_nr_option_01.sis -w info -l /epoc32/winscw/c/interpretsis_test_harness.txt > NUL
+call interpretsis -z .\romdrive -c .\cdrive -s \epoc32\winscw\c\tswi\tsis\data\sp_int_nr_option_01.sis -w info -l /epoc32/winscw/c/interpretsis_test_harness.txt > NUL
+
+if not %errorlevel%==0 GOTO LAST
+if not exist \epoc32\winscw\c\Documents mkdir \epoc32\winscw\c\Documents
+call xcopy .\cdrive\sys\install\sisregistry \epoc32\winscw\c\sys\install\sisregistry /S /Y > NUL
+call xcopy .\cdrive\Documents \epoc32\winscw\c\Documents /S /Y > NUL
+if exist \epoc32\winscw\c\sys\install\sisregistry\backup.lst del \epoc32\winscw\c\sys\install\sisregistry\backup.lst > NUL
+
+ECHO ***ERRORCODE*** %errorlevel% PASS>>/epoc32/winscw/c/interpretsis_test_harness.txt
+GOTO END
+:LAST
+ECHO ***ERRORCODE*** %errorlevel% FAIL>>/epoc32/winscw/c/interpretsis_test_harness.txt
+:END
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/secureswitools/swisistools/test/tinterpretsisinteg/int_nr_option-08_db.bat Mon Mar 15 12:41:05 2010 +0200
@@ -0,0 +1,53 @@
+@rem
+@rem Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+@rem All rights reserved.
+@rem This component and the accompanying materials are made available
+@rem under the terms of the License "Eclipse Public License v1.0"
+@rem which accompanies this distribution, and is available
+@rem at the URL "http://www.eclipse.org/legal/sfl-v10.html".
+@rem
+@rem Initial Contributors:
+@rem Nokia Corporation - initial contribution.
+@rem
+@rem Contributors:
+@rem
+@rem Description:
+@rem
+@ECHO OFF
+REM int_nr_option_08
+REM int_nr_option_08 - SP over SA. This is a positive testcase. Expected Result : SIS file is Installed.
+
+IF NOT EXIST .\backup\cdrive mkdir .\backup\cdrive > NUL
+IF NOT EXIST .\backup\romdrive mkdir .\backup\romdrive > NUL
+if not exist .\cdrive mkdir .\cdrive > NUL
+if not exist .\cdrive\Documents mkdir .\cdrive\Documents > NUL
+if not exist .\romdrive mkdir .\romdrive > NUL
+if not exist .\romdrive\system\ mkdir .\romdrive\system\ > NUL
+if not exist .\romdrive\system\install\ mkdir .\romdrive\system\install\ > NUL
+REM Remove installation files from any previous tests
+if exist .\cdrive\Documents\InstTest\Equivalent*.txt del .\cdrive\Documents\InstTest\Equivalent*.txt > NUL
+
+xcopy /E /Y backup\cdrive cdrive > NUL
+xcopy /E /Y backup\romdrive romdrive > NUL
+
+REM Remove installation files from any previous tests
+if exist \epoc32\winscw\c\Documents\abc*.txt del \epoc32\winscw\c\Documents\abc*.txt > NUL
+if exist \epoc32\winscw\c\sys\install\sisregistry\80000086\*.reg del \epoc32\winscw\c\sys\install\sisregistry\80000086\*.reg > NUL
+if exist \epoc32\winscw\c\sys\install\sisregistry\80000086\*.ctl del \epoc32\winscw\c\sys\install\sisregistry\80000086\*.ctl > NUL
+
+call interpretsis -z .\romdrive -c .\cdrive -s \epoc32\winscw\c\tswi\tsis\data\int_nr_option_01.sis -w info -l /epoc32/winscw/c/interpretsis_test_harness_db.txt > NUL
+call interpretsis -z .\romdrive -c .\cdrive -s \epoc32\winscw\c\tswi\tsis\data\sp_int_nr_option_01.sis -w info -l /epoc32/winscw/c/interpretsis_test_harness_db.txt > NUL
+
+if not %errorlevel%==0 GOTO LAST
+if not exist \epoc32\winscw\c\Documents mkdir \epoc32\winscw\c\Documents
+call xcopy .\cdrive\Documents \epoc32\winscw\c\Documents /S /Y > NUL
+call xcopy .\cdrive\sys\install\sisregistry \epoc32\winscw\c\sys\install\sisregistry /S /Y > NUL
+if exist \epoc32\winscw\c\sys\install\scr\scr.db del \epoc32\winscw\c\sys\install\scr\scr.db > NUL
+copy .\romdrive\sys\install\scr\provisioned\scr.db \epoc32\winscw\c\sys\install\scr\scr.db /Y > NUL
+if exist \epoc32\winscw\c\sys\install\sisregistry\backup.lst del \epoc32\winscw\c\sys\install\sisregistry\backup.lst > NUL
+
+ECHO ***ERRORCODE*** %errorlevel% PASS>>/epoc32/winscw/c/interpretsis_test_harness_db.txt
+GOTO END
+:LAST
+ECHO ***ERRORCODE*** %errorlevel% FAIL>>/epoc32/winscw/c/interpretsis_test_harness_db.txt
+:END
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/secureswitools/swisistools/test/tinterpretsisinteg/int_nr_option-09.bat Mon Mar 15 12:41:05 2010 +0200
@@ -0,0 +1,49 @@
+@rem
+@rem Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+@rem All rights reserved.
+@rem This component and the accompanying materials are made available
+@rem under the terms of the License "Eclipse Public License v1.0"
+@rem which accompanies this distribution, and is available
+@rem at the URL "http://www.eclipse.org/legal/sfl-v10.html".
+@rem
+@rem Initial Contributors:
+@rem Nokia Corporation - initial contribution.
+@rem
+@rem Contributors:
+@rem
+@rem Description:
+@rem
+@ECHO OFF
+REM int_nr_option_09
+REM int_nr_option_09 - SP over SA(NR). This is a positive testcase. Expected Result : SIS file (SP and SA) are Installed.
+
+IF NOT EXIST .\backup\cdrive mkdir .\backup\cdrive > NUL
+IF NOT EXIST .\backup\romdrive mkdir .\backup\romdrive > NUL
+if not exist .\cdrive mkdir .\cdrive > NUL
+if not exist .\cdrive\Documents mkdir .\cdrive\Documents > NUL
+if not exist .\romdrive mkdir .\romdrive > NUL
+if not exist .\romdrive\system\ mkdir .\romdrive\system\ > NUL
+if not exist .\romdrive\system\install\ mkdir .\romdrive\system\install\ > NUL
+
+xcopy /E /Y backup\cdrive cdrive > NUL
+xcopy /E /Y backup\romdrive romdrive > NUL
+
+REM Remove installation files from any previous tests
+if exist \epoc32\winscw\c\Documents\abc*.txt del \epoc32\winscw\c\Documents\abc*.txt > NUL
+if exist \epoc32\winscw\c\sys\install\sisregistry\80000086\*.reg del \epoc32\winscw\c\sys\install\sisregistry\80000086\*.reg > NUL
+if exist \epoc32\winscw\c\sys\install\sisregistry\80000086\*.ctl del \epoc32\winscw\c\sys\install\sisregistry\80000086\*.ctl > NUL
+
+call interpretsis -z .\romdrive -c .\cdrive -s \epoc32\winscw\c\tswi\tsis\data\int_nr_option_01.sis +nonremovablepkg -w info -l /epoc32/winscw/c/interpretsis_test_harness.txt > NUL
+call interpretsis -z .\romdrive -c .\cdrive -s \epoc32\winscw\c\tswi\tsis\data\sp_int_nr_option_01.sis -w info -l /epoc32/winscw/c/interpretsis_test_harness.txt > NUL
+
+if not %errorlevel%==0 GOTO LAST
+if not exist \epoc32\winscw\c\Documents mkdir \epoc32\winscw\c\Documents
+call xcopy .\cdrive\sys\install\sisregistry \epoc32\winscw\c\sys\install\sisregistry /S /Y > NUL
+call xcopy .\cdrive\Documents \epoc32\winscw\c\Documents /S /Y > NUL
+if exist \epoc32\winscw\c\sys\install\sisregistry\backup.lst del \epoc32\winscw\c\sys\install\sisregistry\backup.lst > NUL
+
+ECHO ***ERRORCODE*** %errorlevel% PASS>>/epoc32/winscw/c/interpretsis_test_harness.txt
+GOTO END
+:LAST
+ECHO ***ERRORCODE*** %errorlevel% FAIL>>/epoc32/winscw/c/interpretsis_test_harness.txt
+:END
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/secureswitools/swisistools/test/tinterpretsisinteg/int_nr_option-09_db.bat Mon Mar 15 12:41:05 2010 +0200
@@ -0,0 +1,53 @@
+@rem
+@rem Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+@rem All rights reserved.
+@rem This component and the accompanying materials are made available
+@rem under the terms of the License "Eclipse Public License v1.0"
+@rem which accompanies this distribution, and is available
+@rem at the URL "http://www.eclipse.org/legal/sfl-v10.html".
+@rem
+@rem Initial Contributors:
+@rem Nokia Corporation - initial contribution.
+@rem
+@rem Contributors:
+@rem
+@rem Description:
+@rem
+@ECHO OFF
+REM int_nr_option_09
+REM int_nr_option_09 - SP over SA(NR). This is a positive testcase. Expected Result : SIS file (SP and SA) are Installed.
+
+IF NOT EXIST .\backup\cdrive mkdir .\backup\cdrive > NUL
+IF NOT EXIST .\backup\romdrive mkdir .\backup\romdrive > NUL
+if not exist .\cdrive mkdir .\cdrive > NUL
+if not exist .\cdrive\Documents mkdir .\cdrive\Documents > NUL
+if not exist .\romdrive mkdir .\romdrive > NUL
+if not exist .\romdrive\system\ mkdir .\romdrive\system\ > NUL
+if not exist .\romdrive\system\install\ mkdir .\romdrive\system\install\ > NUL
+REM Remove installation files from any previous tests
+if exist .\cdrive\Documents\InstTest\Equivalent*.txt del .\cdrive\Documents\InstTest\Equivalent*.txt > NUL
+
+xcopy /E /Y backup\cdrive cdrive > NUL
+xcopy /E /Y backup\romdrive romdrive > NUL
+
+REM Remove installation files from any previous tests
+if exist \epoc32\winscw\c\Documents\abc*.txt del \epoc32\winscw\c\Documents\abc*.txt > NUL
+if exist \epoc32\winscw\c\sys\install\sisregistry\80000086\*.reg del \epoc32\winscw\c\sys\install\sisregistry\80000086\*.reg > NUL
+if exist \epoc32\winscw\c\sys\install\sisregistry\80000086\*.ctl del \epoc32\winscw\c\sys\install\sisregistry\80000086\*.ctl > NUL
+
+call interpretsis -z .\romdrive -c .\cdrive -s \epoc32\winscw\c\tswi\tsis\data\int_nr_option_01.sis +nonremovablepkg -w info -l /epoc32/winscw/c/interpretsis_test_harness_db.txt > NUL
+call interpretsis -z .\romdrive -c .\cdrive -s \epoc32\winscw\c\tswi\tsis\data\sp_int_nr_option_01.sis -w info -l /epoc32/winscw/c/interpretsis_test_harness_db.txt > NUL
+
+if not %errorlevel%==0 GOTO LAST
+if not exist \epoc32\winscw\c\Documents mkdir \epoc32\winscw\c\Documents
+call xcopy .\cdrive\Documents \epoc32\winscw\c\Documents /S /Y > NUL
+call xcopy .\cdrive\sys\install\sisregistry \epoc32\winscw\c\sys\install\sisregistry /S /Y > NUL
+if exist \epoc32\winscw\c\sys\install\scr\scr.db del \epoc32\winscw\c\sys\install\scr\scr.db > NUL
+copy .\romdrive\sys\install\scr\provisioned\scr.db \epoc32\winscw\c\sys\install\scr\scr.db /Y > NUL
+if exist \epoc32\winscw\c\sys\install\sisregistry\backup.lst del \epoc32\winscw\c\sys\install\sisregistry\backup.lst > NUL
+
+ECHO ***ERRORCODE*** %errorlevel% PASS>>/epoc32/winscw/c/interpretsis_test_harness_db.txt
+GOTO END
+:LAST
+ECHO ***ERRORCODE*** %errorlevel% FAIL>>/epoc32/winscw/c/interpretsis_test_harness_db.txt
+:END
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/secureswitools/swisistools/test/tinterpretsisinteg/int_nr_option-10.bat Mon Mar 15 12:41:05 2010 +0200
@@ -0,0 +1,49 @@
+@rem
+@rem Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+@rem All rights reserved.
+@rem This component and the accompanying materials are made available
+@rem under the terms of the License "Eclipse Public License v1.0"
+@rem which accompanies this distribution, and is available
+@rem at the URL "http://www.eclipse.org/legal/sfl-v10.html".
+@rem
+@rem Initial Contributors:
+@rem Nokia Corporation - initial contribution.
+@rem
+@rem Contributors:
+@rem
+@rem Description:
+@rem
+@ECHO OFF
+REM int_nr_option_10
+REM int_nr_option_10 - SP(NR) over SA(NR). This is a positive testcase. SIS file (SP and SA) are Installed.
+
+IF NOT EXIST .\backup\cdrive mkdir .\backup\cdrive > NUL
+IF NOT EXIST .\backup\romdrive mkdir .\backup\romdrive > NUL
+if not exist .\cdrive mkdir .\cdrive > NUL
+if not exist .\cdrive\Documents mkdir .\cdrive\Documents > NUL
+if not exist .\romdrive mkdir .\romdrive > NUL
+if not exist .\romdrive\system\ mkdir .\romdrive\system\ > NUL
+if not exist .\romdrive\system\install\ mkdir .\romdrive\system\install\ > NUL
+
+xcopy /E /Y backup\cdrive cdrive > NUL
+xcopy /E /Y backup\romdrive romdrive > NUL
+
+REM Remove installation files from any previous tests
+if exist \epoc32\winscw\c\Documents\abc*.txt del \epoc32\winscw\c\Documents\abc*.txt > NUL
+if exist \epoc32\winscw\c\sys\install\sisregistry\80000086\*.reg del \epoc32\winscw\c\sys\install\sisregistry\80000086\*.reg > NUL
+if exist \epoc32\winscw\c\sys\install\sisregistry\80000086\*.ctl del \epoc32\winscw\c\sys\install\sisregistry\80000086\*.ctl > NUL
+
+call interpretsis -z .\romdrive -c .\cdrive -s \epoc32\winscw\c\tswi\tsis\data\int_nr_option_01.sis +nonremovablepkg -w info -l /epoc32/winscw/c/interpretsis_test_harness.txt > NUL
+call interpretsis -z .\romdrive -c .\cdrive -s \epoc32\winscw\c\tswi\tsis\data\sp_int_nr_option_01.sis +nonremovablepkg -w info -l /epoc32/winscw/c/interpretsis_test_harness.txt > NUL
+
+if not %errorlevel%==0 GOTO LAST
+if not exist \epoc32\winscw\c\Documents mkdir \epoc32\winscw\c\Documents
+call xcopy .\cdrive\sys\install\sisregistry \epoc32\winscw\c\sys\install\sisregistry /S /Y > NUL
+call xcopy .\cdrive\Documents \epoc32\winscw\c\Documents /S /Y > NUL
+if exist \epoc32\winscw\c\sys\install\sisregistry\backup.lst del \epoc32\winscw\c\sys\install\sisregistry\backup.lst > NUL
+
+ECHO ***ERRORCODE*** %errorlevel% PASS>>/epoc32/winscw/c/interpretsis_test_harness.txt
+GOTO END
+:LAST
+ECHO ***ERRORCODE*** %errorlevel% FAIL>>/epoc32/winscw/c/interpretsis_test_harness.txt
+:END
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/secureswitools/swisistools/test/tinterpretsisinteg/int_nr_option-10_db.bat Mon Mar 15 12:41:05 2010 +0200
@@ -0,0 +1,53 @@
+@rem
+@rem Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+@rem All rights reserved.
+@rem This component and the accompanying materials are made available
+@rem under the terms of the License "Eclipse Public License v1.0"
+@rem which accompanies this distribution, and is available
+@rem at the URL "http://www.eclipse.org/legal/sfl-v10.html".
+@rem
+@rem Initial Contributors:
+@rem Nokia Corporation - initial contribution.
+@rem
+@rem Contributors:
+@rem
+@rem Description:
+@rem
+@ECHO OFF
+REM int_nr_option_10
+REM int_nr_option_10 - SP(NR) over SA(NR). This is a positive testcase. SIS file (SP and SA) are Installed.
+
+IF NOT EXIST .\backup\cdrive mkdir .\backup\cdrive > NUL
+IF NOT EXIST .\backup\romdrive mkdir .\backup\romdrive > NUL
+if not exist .\cdrive mkdir .\cdrive > NUL
+if not exist .\cdrive\Documents mkdir .\cdrive\Documents > NUL
+if not exist .\romdrive mkdir .\romdrive > NUL
+if not exist .\romdrive\system\ mkdir .\romdrive\system\ > NUL
+if not exist .\romdrive\system\install\ mkdir .\romdrive\system\install\ > NUL
+REM Remove installation files from any previous tests
+if exist .\cdrive\Documents\InstTest\Equivalent*.txt del .\cdrive\Documents\InstTest\Equivalent*.txt > NUL
+
+xcopy /E /Y backup\cdrive cdrive > NUL
+xcopy /E /Y backup\romdrive romdrive > NUL
+
+REM Remove installation files from any previous tests
+if exist \epoc32\winscw\c\Documents\abc*.txt del \epoc32\winscw\c\Documents\abc*.txt > NUL
+if exist \epoc32\winscw\c\sys\install\sisregistry\80000086\*.reg del \epoc32\winscw\c\sys\install\sisregistry\80000086\*.reg > NUL
+if exist \epoc32\winscw\c\sys\install\sisregistry\80000086\*.ctl del \epoc32\winscw\c\sys\install\sisregistry\80000086\*.ctl > NUL
+
+call interpretsis -z .\romdrive -c .\cdrive -s \epoc32\winscw\c\tswi\tsis\data\int_nr_option_01.sis +nonremovablepkg -w info -l /epoc32/winscw/c/interpretsis_test_harness_db.txt > NUL
+call interpretsis -z .\romdrive -c .\cdrive -s \epoc32\winscw\c\tswi\tsis\data\sp_int_nr_option_01.sis +nonremovablepkg -w info -l /epoc32/winscw/c/interpretsis_test_harness_db.txt > NUL
+
+if not %errorlevel%==0 GOTO LAST
+if not exist \epoc32\winscw\c\Documents mkdir \epoc32\winscw\c\Documents
+call xcopy .\cdrive\Documents \epoc32\winscw\c\Documents /S /Y > NUL
+call xcopy .\cdrive\sys\install\sisregistry \epoc32\winscw\c\sys\install\sisregistry /S /Y > NUL
+if exist \epoc32\winscw\c\sys\install\scr\scr.db del \epoc32\winscw\c\sys\install\scr\scr.db > NUL
+copy .\romdrive\sys\install\scr\provisioned\scr.db \epoc32\winscw\c\sys\install\scr\scr.db /Y > NUL
+if exist \epoc32\winscw\c\sys\install\sisregistry\backup.lst del \epoc32\winscw\c\sys\install\sisregistry\backup.lst > NUL
+
+ECHO ***ERRORCODE*** %errorlevel% PASS>>/epoc32/winscw/c/interpretsis_test_harness_db.txt
+GOTO END
+:LAST
+ECHO ***ERRORCODE*** %errorlevel% FAIL>>/epoc32/winscw/c/interpretsis_test_harness_db.txt
+:END
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/secureswitools/swisistools/test/tinterpretsisinteg/int_nr_option-11.bat Mon Mar 15 12:41:05 2010 +0200
@@ -0,0 +1,49 @@
+@rem
+@rem Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+@rem All rights reserved.
+@rem This component and the accompanying materials are made available
+@rem under the terms of the License "Eclipse Public License v1.0"
+@rem which accompanies this distribution, and is available
+@rem at the URL "http://www.eclipse.org/legal/sfl-v10.html".
+@rem
+@rem Initial Contributors:
+@rem Nokia Corporation - initial contribution.
+@rem
+@rem Contributors:
+@rem
+@rem Description:
+@rem
+@ECHO OFF
+REM int_nr_option_11
+REM int_nr_option_11 - PU over SA. This is a positive testcase. SIS file is Installed.
+
+IF NOT EXIST .\backup\cdrive mkdir .\backup\cdrive > NUL
+IF NOT EXIST .\backup\romdrive mkdir .\backup\romdrive > NUL
+if not exist .\cdrive mkdir .\cdrive > NUL
+if not exist .\cdrive\Documents mkdir .\cdrive\Documents > NUL
+if not exist .\romdrive mkdir .\romdrive > NUL
+if not exist .\romdrive\system\ mkdir .\romdrive\system\ > NUL
+if not exist .\romdrive\system\install\ mkdir .\romdrive\system\install\ > NUL
+
+xcopy /E /Y backup\cdrive cdrive > NUL
+xcopy /E /Y backup\romdrive romdrive > NUL
+
+REM Remove installation files from any previous tests
+if exist \epoc32\winscw\c\Documents\abc*.txt del \epoc32\winscw\c\Documents\abc*.txt > NUL
+if exist \epoc32\winscw\c\sys\install\sisregistry\80000086\*.reg del \epoc32\winscw\c\sys\install\sisregistry\80000086\*.reg > NUL
+if exist \epoc32\winscw\c\sys\install\sisregistry\80000086\*.ctl del \epoc32\winscw\c\sys\install\sisregistry\80000086\*.ctl > NUL
+
+call interpretsis -z .\romdrive -c .\cdrive -s \epoc32\winscw\c\tswi\tsis\data\int_nr_option_01.sis -w info -l /epoc32/winscw/c/interpretsis_test_harness.txt > NUL
+call interpretsis -z .\romdrive -c .\cdrive -s \epoc32\winscw\c\tswi\tsis\data\pu_int_nr_option_01.sis -w info -l /epoc32/winscw/c/interpretsis_test_harness.txt > NUL
+
+if not %errorlevel%==0 GOTO LAST
+if not exist \epoc32\winscw\c\Documents mkdir \epoc32\winscw\c\Documents
+call xcopy .\cdrive\sys\install\sisregistry \epoc32\winscw\c\sys\install\sisregistry /S /Y > NUL
+call xcopy .\cdrive\Documents \epoc32\winscw\c\Documents /S /Y > NUL
+if exist \epoc32\winscw\c\sys\install\sisregistry\backup.lst del \epoc32\winscw\c\sys\install\sisregistry\backup.lst > NUL
+
+ECHO ***ERRORCODE*** %errorlevel% PASS>>/epoc32/winscw/c/interpretsis_test_harness.txt
+GOTO END
+:LAST
+ECHO ***ERRORCODE*** %errorlevel% FAIL>>/epoc32/winscw/c/interpretsis_test_harness.txt
+:END
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/secureswitools/swisistools/test/tinterpretsisinteg/int_nr_option-11_db.bat Mon Mar 15 12:41:05 2010 +0200
@@ -0,0 +1,53 @@
+@rem
+@rem Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+@rem All rights reserved.
+@rem This component and the accompanying materials are made available
+@rem under the terms of the License "Eclipse Public License v1.0"
+@rem which accompanies this distribution, and is available
+@rem at the URL "http://www.eclipse.org/legal/sfl-v10.html".
+@rem
+@rem Initial Contributors:
+@rem Nokia Corporation - initial contribution.
+@rem
+@rem Contributors:
+@rem
+@rem Description:
+@rem
+@ECHO OFF
+REM int_nr_option_11
+REM int_nr_option_11 - PU over SA. This is a positive testcase. SIS file is Installed.
+
+IF NOT EXIST .\backup\cdrive mkdir .\backup\cdrive > NUL
+IF NOT EXIST .\backup\romdrive mkdir .\backup\romdrive > NUL
+if not exist .\cdrive mkdir .\cdrive > NUL
+if not exist .\cdrive\Documents mkdir .\cdrive\Documents > NUL
+if not exist .\romdrive mkdir .\romdrive > NUL
+if not exist .\romdrive\system\ mkdir .\romdrive\system\ > NUL
+if not exist .\romdrive\system\install\ mkdir .\romdrive\system\install\ > NUL
+REM Remove installation files from any previous tests
+if exist .\cdrive\Documents\InstTest\Equivalent*.txt del .\cdrive\Documents\InstTest\Equivalent*.txt > NUL
+
+xcopy /E /Y backup\cdrive cdrive > NUL
+xcopy /E /Y backup\romdrive romdrive > NUL
+
+REM Remove installation files from any previous tests
+if exist \epoc32\winscw\c\Documents\abc*.txt del \epoc32\winscw\c\Documents\abc*.txt > NUL
+if exist \epoc32\winscw\c\sys\install\sisregistry\80000086\*.reg del \epoc32\winscw\c\sys\install\sisregistry\80000086\*.reg > NUL
+if exist \epoc32\winscw\c\sys\install\sisregistry\80000086\*.ctl del \epoc32\winscw\c\sys\install\sisregistry\80000086\*.ctl > NUL
+
+call interpretsis -z .\romdrive -c .\cdrive -s \epoc32\winscw\c\tswi\tsis\data\int_nr_option_01.sis -w info -l /epoc32/winscw/c/interpretsis_test_harness_db.txt > NUL
+call interpretsis -z .\romdrive -c .\cdrive -s \epoc32\winscw\c\tswi\tsis\data\pu_int_nr_option_01.sis -w info -l /epoc32/winscw/c/interpretsis_test_harness_db.txt > NUL
+
+if not %errorlevel%==0 GOTO LAST
+if not exist \epoc32\winscw\c\Documents mkdir \epoc32\winscw\c\Documents
+call xcopy .\cdrive\Documents \epoc32\winscw\c\Documents /S /Y > NUL
+call xcopy .\cdrive\sys\install\sisregistry \epoc32\winscw\c\sys\install\sisregistry /S /Y > NUL
+if exist \epoc32\winscw\c\sys\install\scr\scr.db del \epoc32\winscw\c\sys\install\scr\scr.db > NUL
+copy .\romdrive\sys\install\scr\provisioned\scr.db \epoc32\winscw\c\sys\install\scr\scr.db /Y > NUL
+if exist \epoc32\winscw\c\sys\install\sisregistry\backup.lst del \epoc32\winscw\c\sys\install\sisregistry\backup.lst > NUL
+
+ECHO ***ERRORCODE*** %errorlevel% PASS>>/epoc32/winscw/c/interpretsis_test_harness_db.txt
+GOTO END
+:LAST
+ECHO ***ERRORCODE*** %errorlevel% FAIL>>/epoc32/winscw/c/interpretsis_test_harness_db.txt
+:END
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/secureswitools/swisistools/test/tinterpretsisinteg/int_nr_option-12.bat Mon Mar 15 12:41:05 2010 +0200
@@ -0,0 +1,49 @@
+@rem
+@rem Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+@rem All rights reserved.
+@rem This component and the accompanying materials are made available
+@rem under the terms of the License "Eclipse Public License v1.0"
+@rem which accompanies this distribution, and is available
+@rem at the URL "http://www.eclipse.org/legal/sfl-v10.html".
+@rem
+@rem Initial Contributors:
+@rem Nokia Corporation - initial contribution.
+@rem
+@rem Contributors:
+@rem
+@rem Description:
+@rem
+@ECHO OFF
+REM int_nr_option_12
+REM int_nr_option_12 - PU over SA(NR). This is a positive testcase. SIS file is not Installed.
+
+IF NOT EXIST .\backup\cdrive mkdir .\backup\cdrive > NUL
+IF NOT EXIST .\backup\romdrive mkdir .\backup\romdrive > NUL
+if not exist .\cdrive mkdir .\cdrive > NUL
+if not exist .\cdrive\Documents mkdir .\cdrive\Documents > NUL
+if not exist .\romdrive mkdir .\romdrive > NUL
+if not exist .\romdrive\system\ mkdir .\romdrive\system\ > NUL
+if not exist .\romdrive\system\install\ mkdir .\romdrive\system\install\ > NUL
+
+xcopy /E /Y backup\cdrive cdrive > NUL
+xcopy /E /Y backup\romdrive romdrive > NUL
+
+REM Remove installation files from any previous tests
+if exist \epoc32\winscw\c\Documents\abc*.txt del \epoc32\winscw\c\Documents\abc*.txt > NUL
+if exist \epoc32\winscw\c\sys\install\sisregistry\80000086\*.reg del \epoc32\winscw\c\sys\install\sisregistry\80000086\*.reg > NUL
+if exist \epoc32\winscw\c\sys\install\sisregistry\80000086\*.ctl del \epoc32\winscw\c\sys\install\sisregistry\80000086\*.ctl > NUL
+
+call interpretsis -z .\romdrive -c .\cdrive -s \epoc32\winscw\c\tswi\tsis\data\int_nr_option_01.sis +nonremovablepkg -w info -l /epoc32/winscw/c/interpretsis_test_harness.txt > NUL
+call interpretsis -z .\romdrive -c .\cdrive -s \epoc32\winscw\c\tswi\tsis\data\pu_int_nr_option_01.sis -w info -l /epoc32/winscw/c/interpretsis_test_harness.txt > NUL
+
+if not %errorlevel%==0 GOTO LAST
+if not exist \epoc32\winscw\c\Documents mkdir \epoc32\winscw\c\Documents
+call xcopy .\cdrive\sys\install\sisregistry \epoc32\winscw\c\sys\install\sisregistry /S /Y > NUL
+call xcopy .\cdrive\Documents \epoc32\winscw\c\Documents /S /Y > NUL
+if exist \epoc32\winscw\c\sys\install\sisregistry\backup.lst del \epoc32\winscw\c\sys\install\sisregistry\backup.lst > NUL
+
+ECHO ***ERRORCODE*** %errorlevel% PASS>>/epoc32/winscw/c/interpretsis_test_harness.txt
+GOTO END
+:LAST
+ECHO ***ERRORCODE*** %errorlevel% FAIL>>/epoc32/winscw/c/interpretsis_test_harness.txt
+:END
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/secureswitools/swisistools/test/tinterpretsisinteg/int_nr_option-12_db.bat Mon Mar 15 12:41:05 2010 +0200
@@ -0,0 +1,53 @@
+@rem
+@rem Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+@rem All rights reserved.
+@rem This component and the accompanying materials are made available
+@rem under the terms of the License "Eclipse Public License v1.0"
+@rem which accompanies this distribution, and is available
+@rem at the URL "http://www.eclipse.org/legal/sfl-v10.html".
+@rem
+@rem Initial Contributors:
+@rem Nokia Corporation - initial contribution.
+@rem
+@rem Contributors:
+@rem
+@rem Description:
+@rem
+@ECHO OFF
+REM int_nr_option_12
+REM int_nr_option_12 - PU over SA(NR). This is a positive testcase. SIS file is not Installed.
+
+IF NOT EXIST .\backup\cdrive mkdir .\backup\cdrive > NUL
+IF NOT EXIST .\backup\romdrive mkdir .\backup\romdrive > NUL
+if not exist .\cdrive mkdir .\cdrive > NUL
+if not exist .\cdrive\Documents mkdir .\cdrive\Documents > NUL
+if not exist .\romdrive mkdir .\romdrive > NUL
+if not exist .\romdrive\system\ mkdir .\romdrive\system\ > NUL
+if not exist .\romdrive\system\install\ mkdir .\romdrive\system\install\ > NUL
+REM Remove installation files from any previous tests
+if exist .\cdrive\Documents\InstTest\Equivalent*.txt del .\cdrive\Documents\InstTest\Equivalent*.txt > NUL
+
+xcopy /E /Y backup\cdrive cdrive > NUL
+xcopy /E /Y backup\romdrive romdrive > NUL
+
+REM Remove installation files from any previous tests
+if exist \epoc32\winscw\c\Documents\abc*.txt del \epoc32\winscw\c\Documents\abc*.txt > NUL
+if exist \epoc32\winscw\c\sys\install\sisregistry\80000086\*.reg del \epoc32\winscw\c\sys\install\sisregistry\80000086\*.reg > NUL
+if exist \epoc32\winscw\c\sys\install\sisregistry\80000086\*.ctl del \epoc32\winscw\c\sys\install\sisregistry\80000086\*.ctl > NUL
+
+call interpretsis -z .\romdrive -c .\cdrive -s \epoc32\winscw\c\tswi\tsis\data\int_nr_option_01.sis +nonremovablepkg -w info -l /epoc32/winscw/c/interpretsis_test_harness_db.txt > NUL
+call interpretsis -z .\romdrive -c .\cdrive -s \epoc32\winscw\c\tswi\tsis\data\pu_int_nr_option_01.sis -w info -l /epoc32/winscw/c/interpretsis_test_harness_db.txt > NUL
+
+if not %errorlevel%==0 GOTO LAST
+if not exist \epoc32\winscw\c\Documents mkdir \epoc32\winscw\c\Documents
+call xcopy .\cdrive\Documents \epoc32\winscw\c\Documents /S /Y > NUL
+call xcopy .\cdrive\sys\install\sisregistry \epoc32\winscw\c\sys\install\sisregistry /S /Y > NUL
+if exist \epoc32\winscw\c\sys\install\scr\scr.db del \epoc32\winscw\c\sys\install\scr\scr.db > NUL
+copy .\romdrive\sys\install\scr\provisioned\scr.db \epoc32\winscw\c\sys\install\scr\scr.db /Y > NUL
+if exist \epoc32\winscw\c\sys\install\sisregistry\backup.lst del \epoc32\winscw\c\sys\install\sisregistry\backup.lst > NUL
+
+ECHO ***ERRORCODE*** %errorlevel% PASS>>/epoc32/winscw/c/interpretsis_test_harness_db.txt
+GOTO END
+:LAST
+ECHO ***ERRORCODE*** %errorlevel% FAIL>>/epoc32/winscw/c/interpretsis_test_harness_db.txt
+:END
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/secureswitools/swisistools/test/tinterpretsisinteg/int_nr_option-13.bat Mon Mar 15 12:41:05 2010 +0200
@@ -0,0 +1,49 @@
+@rem
+@rem Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+@rem All rights reserved.
+@rem This component and the accompanying materials are made available
+@rem under the terms of the License "Eclipse Public License v1.0"
+@rem which accompanies this distribution, and is available
+@rem at the URL "http://www.eclipse.org/legal/sfl-v10.html".
+@rem
+@rem Initial Contributors:
+@rem Nokia Corporation - initial contribution.
+@rem
+@rem Contributors:
+@rem
+@rem Description:
+@rem
+@ECHO OFF
+REM int_nr_option_13
+REM int_nr_option_13 - PU(NR) over SA(NR). This is a positive testcase. SIS file is Installed.
+
+IF NOT EXIST .\backup\cdrive mkdir .\backup\cdrive > NUL
+IF NOT EXIST .\backup\romdrive mkdir .\backup\romdrive > NUL
+if not exist .\cdrive mkdir .\cdrive > NUL
+if not exist .\cdrive\Documents mkdir .\cdrive\Documents > NUL
+if not exist .\romdrive mkdir .\romdrive > NUL
+if not exist .\romdrive\system\ mkdir .\romdrive\system\ > NUL
+if not exist .\romdrive\system\install\ mkdir .\romdrive\system\install\ > NUL
+
+xcopy /E /Y backup\cdrive cdrive > NUL
+xcopy /E /Y backup\romdrive romdrive > NUL
+
+REM Remove installation files from any previous tests
+if exist \epoc32\winscw\c\Documents\abc*.txt del \epoc32\winscw\c\Documents\abc*.txt > NUL
+if exist \epoc32\winscw\c\sys\install\sisregistry\80000086\*.reg del \epoc32\winscw\c\sys\install\sisregistry\80000086\*.reg > NUL
+if exist \epoc32\winscw\c\sys\install\sisregistry\80000086\*.ctl del \epoc32\winscw\c\sys\install\sisregistry\80000086\*.ctl > NUL
+
+call interpretsis -z .\romdrive -c .\cdrive -s \epoc32\winscw\c\tswi\tsis\data\int_nr_option_01.sis +nonremovablepkg -w info -l /epoc32/winscw/c/interpretsis_test_harness.txt > NUL
+call interpretsis -z .\romdrive -c .\cdrive -s \epoc32\winscw\c\tswi\tsis\data\pu_int_nr_option_01.sis +nonremovablepkg -w info -l /epoc32/winscw/c/interpretsis_test_harness.txt > NUL
+
+if not %errorlevel%==0 GOTO LAST
+if not exist \epoc32\winscw\c\Documents mkdir \epoc32\winscw\c\Documents
+call xcopy .\cdrive\sys\install\sisregistry \epoc32\winscw\c\sys\install\sisregistry /S /Y > NUL
+call xcopy .\cdrive\Documents \epoc32\winscw\c\Documents /S /Y > NUL
+if exist \epoc32\winscw\c\sys\install\sisregistry\backup.lst del \epoc32\winscw\c\sys\install\sisregistry\backup.lst > NUL
+
+ECHO ***ERRORCODE*** %errorlevel% PASS>>/epoc32/winscw/c/interpretsis_test_harness.txt
+GOTO END
+:LAST
+ECHO ***ERRORCODE*** %errorlevel% FAIL>>/epoc32/winscw/c/interpretsis_test_harness.txt
+:END
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/secureswitools/swisistools/test/tinterpretsisinteg/int_nr_option-13_db.bat Mon Mar 15 12:41:05 2010 +0200
@@ -0,0 +1,53 @@
+@rem
+@rem Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+@rem All rights reserved.
+@rem This component and the accompanying materials are made available
+@rem under the terms of the License "Eclipse Public License v1.0"
+@rem which accompanies this distribution, and is available
+@rem at the URL "http://www.eclipse.org/legal/sfl-v10.html".
+@rem
+@rem Initial Contributors:
+@rem Nokia Corporation - initial contribution.
+@rem
+@rem Contributors:
+@rem
+@rem Description:
+@rem
+@ECHO OFF
+REM int_nr_option_13
+REM int_nr_option_13 - PU(NR) over SA(NR). This is a positive testcase. SIS file is Installed.
+
+IF NOT EXIST .\backup\cdrive mkdir .\backup\cdrive > NUL
+IF NOT EXIST .\backup\romdrive mkdir .\backup\romdrive > NUL
+if not exist .\cdrive mkdir .\cdrive > NUL
+if not exist .\cdrive\Documents mkdir .\cdrive\Documents > NUL
+if not exist .\romdrive mkdir .\romdrive > NUL
+if not exist .\romdrive\system\ mkdir .\romdrive\system\ > NUL
+if not exist .\romdrive\system\install\ mkdir .\romdrive\system\install\ > NUL
+REM Remove installation files from any previous tests
+if exist .\cdrive\Documents\InstTest\Equivalent*.txt del .\cdrive\Documents\InstTest\Equivalent*.txt > NUL
+
+xcopy /E /Y backup\cdrive cdrive > NUL
+xcopy /E /Y backup\romdrive romdrive > NUL
+
+REM Remove installation files from any previous tests
+if exist \epoc32\winscw\c\Documents\abc*.txt del \epoc32\winscw\c\Documents\abc*.txt > NUL
+if exist \epoc32\winscw\c\sys\install\sisregistry\80000086\*.reg del \epoc32\winscw\c\sys\install\sisregistry\80000086\*.reg > NUL
+if exist \epoc32\winscw\c\sys\install\sisregistry\80000086\*.ctl del \epoc32\winscw\c\sys\install\sisregistry\80000086\*.ctl > NUL
+
+call interpretsis -z .\romdrive -c .\cdrive -s \epoc32\winscw\c\tswi\tsis\data\int_nr_option_01.sis +nonremovablepkg -w info -l /epoc32/winscw/c/interpretsis_test_harness_db.txt > NUL
+call interpretsis -z .\romdrive -c .\cdrive -s \epoc32\winscw\c\tswi\tsis\data\pu_int_nr_option_01.sis +nonremovablepkg -w info -l /epoc32/winscw/c/interpretsis_test_harness_db.txt > NUL
+
+if not %errorlevel%==0 GOTO LAST
+if not exist \epoc32\winscw\c\Documents mkdir \epoc32\winscw\c\Documents
+call xcopy .\cdrive\Documents \epoc32\winscw\c\Documents /S /Y > NUL
+call xcopy .\cdrive\sys\install\sisregistry \epoc32\winscw\c\sys\install\sisregistry /S /Y > NUL
+if exist \epoc32\winscw\c\sys\install\scr\scr.db del \epoc32\winscw\c\sys\install\scr\scr.db > NUL
+copy .\romdrive\sys\install\scr\provisioned\scr.db \epoc32\winscw\c\sys\install\scr\scr.db /Y > NUL
+if exist \epoc32\winscw\c\sys\install\sisregistry\backup.lst del \epoc32\winscw\c\sys\install\sisregistry\backup.lst > NUL
+
+ECHO ***ERRORCODE*** %errorlevel% PASS>>/epoc32/winscw/c/interpretsis_test_harness_db.txt
+GOTO END
+:LAST
+ECHO ***ERRORCODE*** %errorlevel% FAIL>>/epoc32/winscw/c/interpretsis_test_harness_db.txt
+:END
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/secureswitools/swisistools/test/tinterpretsisinteg/int_nr_option-14.bat Mon Mar 15 12:41:05 2010 +0200
@@ -0,0 +1,50 @@
+@rem
+@rem Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+@rem All rights reserved.
+@rem This component and the accompanying materials are made available
+@rem under the terms of the License "Eclipse Public License v1.0"
+@rem which accompanies this distribution, and is available
+@rem at the URL "http://www.eclipse.org/legal/sfl-v10.html".
+@rem
+@rem Initial Contributors:
+@rem Nokia Corporation - initial contribution.
+@rem
+@rem Contributors:
+@rem
+@rem Description:
+@rem
+@ECHO OFF
+REM int_nr_option_14
+REM int_nr_option_14 - SA over SA+SP. This is a positive testcase. SIS file is Installed.
+
+IF NOT EXIST .\backup\cdrive mkdir .\backup\cdrive > NUL
+IF NOT EXIST .\backup\romdrive mkdir .\backup\romdrive > NUL
+if not exist .\cdrive mkdir .\cdrive > NUL
+if not exist .\cdrive\Documents mkdir .\cdrive\Documents > NUL
+if not exist .\romdrive mkdir .\romdrive > NUL
+if not exist .\romdrive\system\ mkdir .\romdrive\system\ > NUL
+if not exist .\romdrive\system\install\ mkdir .\romdrive\system\install\ > NUL
+
+xcopy /E /Y backup\cdrive cdrive > NUL
+xcopy /E /Y backup\romdrive romdrive > NUL
+
+REM Remove installation files from any previous tests
+if exist \epoc32\winscw\c\Documents\abc*.txt del \epoc32\winscw\c\Documents\abc*.txt > NUL
+if exist \epoc32\winscw\c\sys\install\sisregistry\80000086\*.reg del \epoc32\winscw\c\sys\install\sisregistry\80000086\*.reg > NUL
+if exist \epoc32\winscw\c\sys\install\sisregistry\80000086\*.ctl del \epoc32\winscw\c\sys\install\sisregistry\80000086\*.ctl > NUL
+
+call interpretsis -z .\romdrive -c .\cdrive -s \epoc32\winscw\c\tswi\tsis\data\int_nr_option_01.sis -w info -l /epoc32/winscw/c/interpretsis_test_harness.txt > NUL
+call interpretsis -z .\romdrive -c .\cdrive -s \epoc32\winscw\c\tswi\tsis\data\sp_int_nr_option_01.sis -w info -l /epoc32/winscw/c/interpretsis_test_harness.txt > NUL
+call interpretsis -z .\romdrive -c .\cdrive -s \epoc32\winscw\c\tswi\tsis\data\int_nr_option_01.sis -w info -l /epoc32/winscw/c/interpretsis_test_harness.txt > NUL
+
+if not %errorlevel%==0 GOTO LAST
+if not exist \epoc32\winscw\c\Documents mkdir \epoc32\winscw\c\Documents
+call xcopy .\cdrive\sys\install\sisregistry \epoc32\winscw\c\sys\install\sisregistry /S /Y > NUL
+call xcopy .\cdrive\Documents \epoc32\winscw\c\Documents /S /Y > NUL
+if exist \epoc32\winscw\c\sys\install\sisregistry\backup.lst del \epoc32\winscw\c\sys\install\sisregistry\backup.lst > NUL
+
+ECHO ***ERRORCODE*** %errorlevel% PASS>>/epoc32/winscw/c/interpretsis_test_harness.txt
+GOTO END
+:LAST
+ECHO ***ERRORCODE*** %errorlevel% FAIL>>/epoc32/winscw/c/interpretsis_test_harness.txt
+:END
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/secureswitools/swisistools/test/tinterpretsisinteg/int_nr_option-14_db.bat Mon Mar 15 12:41:05 2010 +0200
@@ -0,0 +1,54 @@
+@rem
+@rem Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+@rem All rights reserved.
+@rem This component and the accompanying materials are made available
+@rem under the terms of the License "Eclipse Public License v1.0"
+@rem which accompanies this distribution, and is available
+@rem at the URL "http://www.eclipse.org/legal/sfl-v10.html".
+@rem
+@rem Initial Contributors:
+@rem Nokia Corporation - initial contribution.
+@rem
+@rem Contributors:
+@rem
+@rem Description:
+@rem
+@ECHO OFF
+REM int_nr_option_14
+REM int_nr_option_14 - SA over SA+SP. This is a positive testcase. SIS file is Installed.
+
+IF NOT EXIST .\backup\cdrive mkdir .\backup\cdrive > NUL
+IF NOT EXIST .\backup\romdrive mkdir .\backup\romdrive > NUL
+if not exist .\cdrive mkdir .\cdrive > NUL
+if not exist .\cdrive\Documents mkdir .\cdrive\Documents > NUL
+if not exist .\romdrive mkdir .\romdrive > NUL
+if not exist .\romdrive\system\ mkdir .\romdrive\system\ > NUL
+if not exist .\romdrive\system\install\ mkdir .\romdrive\system\install\ > NUL
+REM Remove installation files from any previous tests
+if exist .\cdrive\Documents\InstTest\Equivalent*.txt del .\cdrive\Documents\InstTest\Equivalent*.txt > NUL
+
+xcopy /E /Y backup\cdrive cdrive > NUL
+xcopy /E /Y backup\romdrive romdrive > NUL
+
+REM Remove installation files from any previous tests
+if exist \epoc32\winscw\c\Documents\abc*.txt del \epoc32\winscw\c\Documents\abc*.txt > NUL
+if exist \epoc32\winscw\c\sys\install\sisregistry\80000086\*.reg del \epoc32\winscw\c\sys\install\sisregistry\80000086\*.reg > NUL
+if exist \epoc32\winscw\c\sys\install\sisregistry\80000086\*.ctl del \epoc32\winscw\c\sys\install\sisregistry\80000086\*.ctl > NUL
+
+call interpretsis -z .\romdrive -c .\cdrive -s \epoc32\winscw\c\tswi\tsis\data\int_nr_option_01.sis -w info -l /epoc32/winscw/c/interpretsis_test_harness_db.txt > NUL
+call interpretsis -z .\romdrive -c .\cdrive -s \epoc32\winscw\c\tswi\tsis\data\sp_int_nr_option_01.sis -w info -l /epoc32/winscw/c/interpretsis_test_harness_db.txt > NUL
+call interpretsis -z .\romdrive -c .\cdrive -s \epoc32\winscw\c\tswi\tsis\data\int_nr_option_01.sis -w info -l /epoc32/winscw/c/interpretsis_test_harness_db.txt > NUL
+
+if not %errorlevel%==0 GOTO LAST
+if not exist \epoc32\winscw\c\Documents mkdir \epoc32\winscw\c\Documents
+call xcopy .\cdrive\Documents \epoc32\winscw\c\Documents /S /Y > NUL
+call xcopy .\cdrive\sys\install\sisregistry \epoc32\winscw\c\sys\install\sisregistry /S /Y > NUL
+if exist \epoc32\winscw\c\sys\install\scr\scr.db del \epoc32\winscw\c\sys\install\scr\scr.db > NUL
+copy .\romdrive\sys\install\scr\provisioned\scr.db \epoc32\winscw\c\sys\install\scr\scr.db /Y > NUL
+if exist \epoc32\winscw\c\sys\install\sisregistry\backup.lst del \epoc32\winscw\c\sys\install\sisregistry\backup.lst > NUL
+
+ECHO ***ERRORCODE*** %errorlevel% PASS>>/epoc32/winscw/c/interpretsis_test_harness_db.txt
+GOTO END
+:LAST
+ECHO ***ERRORCODE*** %errorlevel% FAIL>>/epoc32/winscw/c/interpretsis_test_harness_db.txt
+:END
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/secureswitools/swisistools/test/tinterpretsisinteg/int_nr_option-15.bat Mon Mar 15 12:41:05 2010 +0200
@@ -0,0 +1,50 @@
+@rem
+@rem Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+@rem All rights reserved.
+@rem This component and the accompanying materials are made available
+@rem under the terms of the License "Eclipse Public License v1.0"
+@rem which accompanies this distribution, and is available
+@rem at the URL "http://www.eclipse.org/legal/sfl-v10.html".
+@rem
+@rem Initial Contributors:
+@rem Nokia Corporation - initial contribution.
+@rem
+@rem Contributors:
+@rem
+@rem Description:
+@rem
+@ECHO OFF
+REM int_nr_option_15
+REM int_nr_option_15 - SA (NR) over SA+SP. This is a positive testcase. SIS file is Installed.
+
+IF NOT EXIST .\backup\cdrive mkdir .\backup\cdrive > NUL
+IF NOT EXIST .\backup\romdrive mkdir .\backup\romdrive > NUL
+if not exist .\cdrive mkdir .\cdrive > NUL
+if not exist .\cdrive\Documents mkdir .\cdrive\Documents > NUL
+if not exist .\romdrive mkdir .\romdrive > NUL
+if not exist .\romdrive\system\ mkdir .\romdrive\system\ > NUL
+if not exist .\romdrive\system\install\ mkdir .\romdrive\system\install\ > NUL
+
+xcopy /E /Y backup\cdrive cdrive > NUL
+xcopy /E /Y backup\romdrive romdrive > NUL
+
+REM Remove installation files from any previous tests
+if exist \epoc32\winscw\c\Documents\abc*.txt del \epoc32\winscw\c\Documents\abc*.txt > NUL
+if exist \epoc32\winscw\c\sys\install\sisregistry\80000086\*.reg del \epoc32\winscw\c\sys\install\sisregistry\80000086\*.reg > NUL
+if exist \epoc32\winscw\c\sys\install\sisregistry\80000086\*.ctl del \epoc32\winscw\c\sys\install\sisregistry\80000086\*.ctl > NUL
+
+call interpretsis -z .\romdrive -c .\cdrive -s \epoc32\winscw\c\tswi\tsis\data\int_nr_option_01.sis -w info -l /epoc32/winscw/c/interpretsis_test_harness.txt > NUL
+call interpretsis -z .\romdrive -c .\cdrive -s \epoc32\winscw\c\tswi\tsis\data\sp_int_nr_option_01.sis -w info -l /epoc32/winscw/c/interpretsis_test_harness.txt > NUL
+call interpretsis -z .\romdrive -c .\cdrive -s \epoc32\winscw\c\tswi\tsis\data\int_nr_option_01.sis +nonremovablepkg -w info -l /epoc32/winscw/c/interpretsis_test_harness.txt > NUL
+
+if not %errorlevel%==0 GOTO LAST
+if not exist \epoc32\winscw\c\Documents mkdir \epoc32\winscw\c\Documents
+call xcopy .\cdrive\sys\install\sisregistry \epoc32\winscw\c\sys\install\sisregistry /S /Y > NUL
+call xcopy .\cdrive\Documents \epoc32\winscw\c\Documents /S /Y > NUL
+if exist \epoc32\winscw\c\sys\install\sisregistry\backup.lst del \epoc32\winscw\c\sys\install\sisregistry\backup.lst > NUL
+
+ECHO ***ERRORCODE*** %errorlevel% PASS>>/epoc32/winscw/c/interpretsis_test_harness.txt
+GOTO END
+:LAST
+ECHO ***ERRORCODE*** %errorlevel% FAIL>>/epoc32/winscw/c/interpretsis_test_harness.txt
+:END
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/secureswitools/swisistools/test/tinterpretsisinteg/int_nr_option-15_db.bat Mon Mar 15 12:41:05 2010 +0200
@@ -0,0 +1,54 @@
+@rem
+@rem Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+@rem All rights reserved.
+@rem This component and the accompanying materials are made available
+@rem under the terms of the License "Eclipse Public License v1.0"
+@rem which accompanies this distribution, and is available
+@rem at the URL "http://www.eclipse.org/legal/sfl-v10.html".
+@rem
+@rem Initial Contributors:
+@rem Nokia Corporation - initial contribution.
+@rem
+@rem Contributors:
+@rem
+@rem Description:
+@rem
+@ECHO OFF
+REM int_nr_option_15
+REM int_nr_option_15 - SA (NR) over SA+SP. This is a positive testcase. SIS file is Installed.
+
+IF NOT EXIST .\backup\cdrive mkdir .\backup\cdrive > NUL
+IF NOT EXIST .\backup\romdrive mkdir .\backup\romdrive > NUL
+if not exist .\cdrive mkdir .\cdrive > NUL
+if not exist .\cdrive\Documents mkdir .\cdrive\Documents > NUL
+if not exist .\romdrive mkdir .\romdrive > NUL
+if not exist .\romdrive\system\ mkdir .\romdrive\system\ > NUL
+if not exist .\romdrive\system\install\ mkdir .\romdrive\system\install\ > NUL
+REM Remove installation files from any previous tests
+if exist .\cdrive\Documents\InstTest\Equivalent*.txt del .\cdrive\Documents\InstTest\Equivalent*.txt > NUL
+
+xcopy /E /Y backup\cdrive cdrive > NUL
+xcopy /E /Y backup\romdrive romdrive > NUL
+
+REM Remove installation files from any previous tests
+if exist \epoc32\winscw\c\Documents\abc*.txt del \epoc32\winscw\c\Documents\abc*.txt > NUL
+if exist \epoc32\winscw\c\sys\install\sisregistry\80000086\*.reg del \epoc32\winscw\c\sys\install\sisregistry\80000086\*.reg > NUL
+if exist \epoc32\winscw\c\sys\install\sisregistry\80000086\*.ctl del \epoc32\winscw\c\sys\install\sisregistry\80000086\*.ctl > NUL
+
+call interpretsis -z .\romdrive -c .\cdrive -s \epoc32\winscw\c\tswi\tsis\data\int_nr_option_01.sis -w info -l /epoc32/winscw/c/interpretsis_test_harness_db.txt > NUL
+call interpretsis -z .\romdrive -c .\cdrive -s \epoc32\winscw\c\tswi\tsis\data\sp_int_nr_option_01.sis -w info -l /epoc32/winscw/c/interpretsis_test_harness_db.txt > NUL
+call interpretsis -z .\romdrive -c .\cdrive -s \epoc32\winscw\c\tswi\tsis\data\int_nr_option_01.sis +nonremovablepkg -w info -l /epoc32/winscw/c/interpretsis_test_harness_db.txt > NUL
+
+if not %errorlevel%==0 GOTO LAST
+if not exist \epoc32\winscw\c\Documents mkdir \epoc32\winscw\c\Documents
+call xcopy .\cdrive\Documents \epoc32\winscw\c\Documents /S /Y > NUL
+call xcopy .\cdrive\sys\install\sisregistry \epoc32\winscw\c\sys\install\sisregistry /S /Y > NUL
+if exist \epoc32\winscw\c\sys\install\scr\scr.db del \epoc32\winscw\c\sys\install\scr\scr.db > NUL
+copy .\romdrive\sys\install\scr\provisioned\scr.db \epoc32\winscw\c\sys\install\scr\scr.db /Y > NUL
+if exist \epoc32\winscw\c\sys\install\sisregistry\backup.lst del \epoc32\winscw\c\sys\install\sisregistry\backup.lst > NUL
+
+ECHO ***ERRORCODE*** %errorlevel% PASS>>/epoc32/winscw/c/interpretsis_test_harness_db.txt
+GOTO END
+:LAST
+ECHO ***ERRORCODE*** %errorlevel% FAIL>>/epoc32/winscw/c/interpretsis_test_harness_db.txt
+:END
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/secureswitools/swisistools/test/tinterpretsisinteg/int_nr_option-16.bat Mon Mar 15 12:41:05 2010 +0200
@@ -0,0 +1,50 @@
+@rem
+@rem Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+@rem All rights reserved.
+@rem This component and the accompanying materials are made available
+@rem under the terms of the License "Eclipse Public License v1.0"
+@rem which accompanies this distribution, and is available
+@rem at the URL "http://www.eclipse.org/legal/sfl-v10.html".
+@rem
+@rem Initial Contributors:
+@rem Nokia Corporation - initial contribution.
+@rem
+@rem Contributors:
+@rem
+@rem Description:
+@rem
+@ECHO OFF
+REM int_nr_option_16
+REM int_nr_option_16 - SA over SA(NR) + SP. This is a positive testcase. SIS file is Installed.
+
+IF NOT EXIST .\backup\cdrive mkdir .\backup\cdrive > NUL
+IF NOT EXIST .\backup\romdrive mkdir .\backup\romdrive > NUL
+if not exist .\cdrive mkdir .\cdrive > NUL
+if not exist .\cdrive\Documents mkdir .\cdrive\Documents > NUL
+if not exist .\romdrive mkdir .\romdrive > NUL
+if not exist .\romdrive\system\ mkdir .\romdrive\system\ > NUL
+if not exist .\romdrive\system\install\ mkdir .\romdrive\system\install\ > NUL
+
+xcopy /E /Y backup\cdrive cdrive > NUL
+xcopy /E /Y backup\romdrive romdrive > NUL
+
+REM Remove installation files from any previous tests
+if exist \epoc32\winscw\c\Documents\abc*.txt del \epoc32\winscw\c\Documents\abc*.txt > NUL
+if exist \epoc32\winscw\c\sys\install\sisregistry\80000086\*.reg del \epoc32\winscw\c\sys\install\sisregistry\80000086\*.reg > NUL
+if exist \epoc32\winscw\c\sys\install\sisregistry\80000086\*.ctl del \epoc32\winscw\c\sys\install\sisregistry\80000086\*.ctl > NUL
+
+call interpretsis -z .\romdrive -c .\cdrive -s \epoc32\winscw\c\tswi\tsis\data\int_nr_option_01.sis +nonremovablepkg -w info -l /epoc32/winscw/c/interpretsis_test_harness.txt > NUL
+call interpretsis -z .\romdrive -c .\cdrive -s \epoc32\winscw\c\tswi\tsis\data\sp_int_nr_option_01.sis -w info -l /epoc32/winscw/c/interpretsis_test_harness.txt > NUL
+call interpretsis -z .\romdrive -c .\cdrive -s \epoc32\winscw\c\tswi\tsis\data\int_nr_option_01.sis -w info -l /epoc32/winscw/c/interpretsis_test_harness.txt > NUL
+
+if not %errorlevel%==0 GOTO LAST
+if not exist \epoc32\winscw\c\Documents mkdir \epoc32\winscw\c\Documents
+call xcopy .\cdrive\sys\install\sisregistry \epoc32\winscw\c\sys\install\sisregistry /S /Y > NUL
+call xcopy .\cdrive\Documents \epoc32\winscw\c\Documents /S /Y > NUL
+if exist \epoc32\winscw\c\sys\install\sisregistry\backup.lst del \epoc32\winscw\c\sys\install\sisregistry\backup.lst > NUL
+
+ECHO ***ERRORCODE*** %errorlevel% PASS>>/epoc32/winscw/c/interpretsis_test_harness.txt
+GOTO END
+:LAST
+ECHO ***ERRORCODE*** %errorlevel% FAIL>>/epoc32/winscw/c/interpretsis_test_harness.txt
+:END
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/secureswitools/swisistools/test/tinterpretsisinteg/int_nr_option-16_db.bat Mon Mar 15 12:41:05 2010 +0200
@@ -0,0 +1,54 @@
+@rem
+@rem Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+@rem All rights reserved.
+@rem This component and the accompanying materials are made available
+@rem under the terms of the License "Eclipse Public License v1.0"
+@rem which accompanies this distribution, and is available
+@rem at the URL "http://www.eclipse.org/legal/sfl-v10.html".
+@rem
+@rem Initial Contributors:
+@rem Nokia Corporation - initial contribution.
+@rem
+@rem Contributors:
+@rem
+@rem Description:
+@rem
+@ECHO OFF
+REM int_nr_option_16
+REM int_nr_option_16 - SA over SA(NR) + SP. This is a positive testcase. SIS file is Installed.
+
+IF NOT EXIST .\backup\cdrive mkdir .\backup\cdrive > NUL
+IF NOT EXIST .\backup\romdrive mkdir .\backup\romdrive > NUL
+if not exist .\cdrive mkdir .\cdrive > NUL
+if not exist .\cdrive\Documents mkdir .\cdrive\Documents > NUL
+if not exist .\romdrive mkdir .\romdrive > NUL
+if not exist .\romdrive\system\ mkdir .\romdrive\system\ > NUL
+if not exist .\romdrive\system\install\ mkdir .\romdrive\system\install\ > NUL
+REM Remove installation files from any previous tests
+if exist .\cdrive\Documents\InstTest\Equivalent*.txt del .\cdrive\Documents\InstTest\Equivalent*.txt > NUL
+
+xcopy /E /Y backup\cdrive cdrive > NUL
+xcopy /E /Y backup\romdrive romdrive > NUL
+
+REM Remove installation files from any previous tests
+if exist \epoc32\winscw\c\Documents\abc*.txt del \epoc32\winscw\c\Documents\abc*.txt > NUL
+if exist \epoc32\winscw\c\sys\install\sisregistry\80000086\*.reg del \epoc32\winscw\c\sys\install\sisregistry\80000086\*.reg > NUL
+if exist \epoc32\winscw\c\sys\install\sisregistry\80000086\*.ctl del \epoc32\winscw\c\sys\install\sisregistry\80000086\*.ctl > NUL
+
+call interpretsis -z .\romdrive -c .\cdrive -s \epoc32\winscw\c\tswi\tsis\data\int_nr_option_01.sis +nonremovablepkg -w info -l /epoc32/winscw/c/interpretsis_test_harness_db.txt > NUL
+call interpretsis -z .\romdrive -c .\cdrive -s \epoc32\winscw\c\tswi\tsis\data\sp_int_nr_option_01.sis -w info -l /epoc32/winscw/c/interpretsis_test_harness_db.txt > NUL
+call interpretsis -z .\romdrive -c .\cdrive -s \epoc32\winscw\c\tswi\tsis\data\int_nr_option_01.sis -w info -l /epoc32/winscw/c/interpretsis_test_harness_db.txt > NUL
+
+if not %errorlevel%==0 GOTO LAST
+if not exist \epoc32\winscw\c\Documents mkdir \epoc32\winscw\c\Documents
+call xcopy .\cdrive\Documents \epoc32\winscw\c\Documents /S /Y > NUL
+call xcopy .\cdrive\sys\install\sisregistry \epoc32\winscw\c\sys\install\sisregistry /S /Y > NUL
+if exist \epoc32\winscw\c\sys\install\scr\scr.db del \epoc32\winscw\c\sys\install\scr\scr.db > NUL
+copy .\romdrive\sys\install\scr\provisioned\scr.db \epoc32\winscw\c\sys\install\scr\scr.db /Y > NUL
+if exist \epoc32\winscw\c\sys\install\sisregistry\backup.lst del \epoc32\winscw\c\sys\install\sisregistry\backup.lst > NUL
+
+ECHO ***ERRORCODE*** %errorlevel% PASS>>/epoc32/winscw/c/interpretsis_test_harness_db.txt
+GOTO END
+:LAST
+ECHO ***ERRORCODE*** %errorlevel% FAIL>>/epoc32/winscw/c/interpretsis_test_harness_db.txt
+:END
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/secureswitools/swisistools/test/tinterpretsisinteg/int_nr_option-17.bat Mon Mar 15 12:41:05 2010 +0200
@@ -0,0 +1,50 @@
+@rem
+@rem Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+@rem All rights reserved.
+@rem This component and the accompanying materials are made available
+@rem under the terms of the License "Eclipse Public License v1.0"
+@rem which accompanies this distribution, and is available
+@rem at the URL "http://www.eclipse.org/legal/sfl-v10.html".
+@rem
+@rem Initial Contributors:
+@rem Nokia Corporation - initial contribution.
+@rem
+@rem Contributors:
+@rem
+@rem Description:
+@rem
+@ECHO OFF
+REM int_nr_option_17
+REM int_nr_option_17 - SA(NR) over SA(NR) + SP. This is a positive testcase. SIS file is Installed.
+
+IF NOT EXIST .\backup\cdrive mkdir .\backup\cdrive > NUL
+IF NOT EXIST .\backup\romdrive mkdir .\backup\romdrive > NUL
+if not exist .\cdrive mkdir .\cdrive > NUL
+if not exist .\cdrive\Documents mkdir .\cdrive\Documents > NUL
+if not exist .\romdrive mkdir .\romdrive > NUL
+if not exist .\romdrive\system\ mkdir .\romdrive\system\ > NUL
+if not exist .\romdrive\system\install\ mkdir .\romdrive\system\install\ > NUL
+
+xcopy /E /Y backup\cdrive cdrive > NUL
+xcopy /E /Y backup\romdrive romdrive > NUL
+
+REM Remove installation files from any previous tests
+if exist \epoc32\winscw\c\Documents\abc*.txt del \epoc32\winscw\c\Documents\abc*.txt > NUL
+if exist \epoc32\winscw\c\sys\install\sisregistry\80000086\*.reg del \epoc32\winscw\c\sys\install\sisregistry\80000086\*.reg > NUL
+if exist \epoc32\winscw\c\sys\install\sisregistry\80000086\*.ctl del \epoc32\winscw\c\sys\install\sisregistry\80000086\*.ctl > NUL
+
+call interpretsis -z .\romdrive -c .\cdrive -s \epoc32\winscw\c\tswi\tsis\data\int_nr_option_01.sis +nonremovablepkg -w info -l /epoc32/winscw/c/interpretsis_test_harness.txt > NUL
+call interpretsis -z .\romdrive -c .\cdrive -s \epoc32\winscw\c\tswi\tsis\data\sp_int_nr_option_01.sis -w info -l /epoc32/winscw/c/interpretsis_test_harness.txt > NUL
+call interpretsis -z .\romdrive -c .\cdrive -s \epoc32\winscw\c\tswi\tsis\data\int_nr_option_01.sis +nonremovablepkg -w info -l /epoc32/winscw/c/interpretsis_test_harness.txt > NUL
+
+if not %errorlevel%==0 GOTO LAST
+if not exist \epoc32\winscw\c\Documents mkdir \epoc32\winscw\c\Documents
+call xcopy .\cdrive\sys\install\sisregistry \epoc32\winscw\c\sys\install\sisregistry /S /Y > NUL
+call xcopy .\cdrive\Documents \epoc32\winscw\c\Documents /S /Y > NUL
+if exist \epoc32\winscw\c\sys\install\sisregistry\backup.lst del \epoc32\winscw\c\sys\install\sisregistry\backup.lst > NUL
+
+ECHO ***ERRORCODE*** %errorlevel% PASS>>/epoc32/winscw/c/interpretsis_test_harness.txt
+GOTO END
+:LAST
+ECHO ***ERRORCODE*** %errorlevel% FAIL>>/epoc32/winscw/c/interpretsis_test_harness.txt
+:END
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/secureswitools/swisistools/test/tinterpretsisinteg/int_nr_option-17_db.bat Mon Mar 15 12:41:05 2010 +0200
@@ -0,0 +1,54 @@
+@rem
+@rem Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+@rem All rights reserved.
+@rem This component and the accompanying materials are made available
+@rem under the terms of the License "Eclipse Public License v1.0"
+@rem which accompanies this distribution, and is available
+@rem at the URL "http://www.eclipse.org/legal/sfl-v10.html".
+@rem
+@rem Initial Contributors:
+@rem Nokia Corporation - initial contribution.
+@rem
+@rem Contributors:
+@rem
+@rem Description:
+@rem
+@ECHO OFF
+REM int_nr_option_17
+REM int_nr_option_17 - SA(NR) over SA(NR) + SP. This is a positive testcase. SIS file is Installed.
+
+IF NOT EXIST .\backup\cdrive mkdir .\backup\cdrive > NUL
+IF NOT EXIST .\backup\romdrive mkdir .\backup\romdrive > NUL
+if not exist .\cdrive mkdir .\cdrive > NUL
+if not exist .\cdrive\Documents mkdir .\cdrive\Documents > NUL
+if not exist .\romdrive mkdir .\romdrive > NUL
+if not exist .\romdrive\system\ mkdir .\romdrive\system\ > NUL
+if not exist .\romdrive\system\install\ mkdir .\romdrive\system\install\ > NUL
+REM Remove installation files from any previous tests
+if exist .\cdrive\Documents\InstTest\Equivalent*.txt del .\cdrive\Documents\InstTest\Equivalent*.txt > NUL
+
+xcopy /E /Y backup\cdrive cdrive > NUL
+xcopy /E /Y backup\romdrive romdrive > NUL
+
+REM Remove installation files from any previous tests
+if exist \epoc32\winscw\c\Documents\abc*.txt del \epoc32\winscw\c\Documents\abc*.txt > NUL
+if exist \epoc32\winscw\c\sys\install\sisregistry\80000086\*.reg del \epoc32\winscw\c\sys\install\sisregistry\80000086\*.reg > NUL
+if exist \epoc32\winscw\c\sys\install\sisregistry\80000086\*.ctl del \epoc32\winscw\c\sys\install\sisregistry\80000086\*.ctl > NUL
+
+call interpretsis -z .\romdrive -c .\cdrive -s \epoc32\winscw\c\tswi\tsis\data\int_nr_option_01.sis +nonremovablepkg -w info -l /epoc32/winscw/c/interpretsis_test_harness_db.txt > NUL
+call interpretsis -z .\romdrive -c .\cdrive -s \epoc32\winscw\c\tswi\tsis\data\sp_int_nr_option_01.sis -w info -l /epoc32/winscw/c/interpretsis_test_harness_db.txt > NUL
+call interpretsis -z .\romdrive -c .\cdrive -s \epoc32\winscw\c\tswi\tsis\data\int_nr_option_01.sis +nonremovablepkg -w info -l /epoc32/winscw/c/interpretsis_test_harness_db.txt > NUL
+
+if not %errorlevel%==0 GOTO LAST
+if not exist \epoc32\winscw\c\Documents mkdir \epoc32\winscw\c\Documents
+call xcopy .\cdrive\Documents \epoc32\winscw\c\Documents /S /Y > NUL
+call xcopy .\cdrive\sys\install\sisregistry \epoc32\winscw\c\sys\install\sisregistry /S /Y > NUL
+if exist \epoc32\winscw\c\sys\install\scr\scr.db del \epoc32\winscw\c\sys\install\scr\scr.db > NUL
+copy .\romdrive\sys\install\scr\provisioned\scr.db \epoc32\winscw\c\sys\install\scr\scr.db /Y > NUL
+if exist \epoc32\winscw\c\sys\install\sisregistry\backup.lst del \epoc32\winscw\c\sys\install\sisregistry\backup.lst > NUL
+
+ECHO ***ERRORCODE*** %errorlevel% PASS>>/epoc32/winscw/c/interpretsis_test_harness_db.txt
+GOTO END
+:LAST
+ECHO ***ERRORCODE*** %errorlevel% FAIL>>/epoc32/winscw/c/interpretsis_test_harness_db.txt
+:END
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/secureswitools/swisistools/test/tinterpretsisinteg/int_nr_option-18.bat Mon Mar 15 12:41:05 2010 +0200
@@ -0,0 +1,50 @@
+@rem
+@rem Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+@rem All rights reserved.
+@rem This component and the accompanying materials are made available
+@rem under the terms of the License "Eclipse Public License v1.0"
+@rem which accompanies this distribution, and is available
+@rem at the URL "http://www.eclipse.org/legal/sfl-v10.html".
+@rem
+@rem Initial Contributors:
+@rem Nokia Corporation - initial contribution.
+@rem
+@rem Contributors:
+@rem
+@rem Description:
+@rem
+@ECHO OFF
+REM int_nr_option_18
+REM int_nr_option_18 - SA over SA(NR) + SP(NR). This is a positive testcase. Expected result : SIS file is Installed.
+
+IF NOT EXIST .\backup\cdrive mkdir .\backup\cdrive > NUL
+IF NOT EXIST .\backup\romdrive mkdir .\backup\romdrive > NUL
+if not exist .\cdrive mkdir .\cdrive > NUL
+if not exist .\cdrive\Documents mkdir .\cdrive\Documents > NUL
+if not exist .\romdrive mkdir .\romdrive > NUL
+if not exist .\romdrive\system\ mkdir .\romdrive\system\ > NUL
+if not exist .\romdrive\system\install\ mkdir .\romdrive\system\install\ > NUL
+
+xcopy /E /Y backup\cdrive cdrive > NUL
+xcopy /E /Y backup\romdrive romdrive > NUL
+
+REM Remove installation files from any previous tests
+if exist \epoc32\winscw\c\Documents\abc*.txt del \epoc32\winscw\c\Documents\abc*.txt > NUL
+if exist \epoc32\winscw\c\sys\install\sisregistry\80000086\*.reg del \epoc32\winscw\c\sys\install\sisregistry\80000086\*.reg > NUL
+if exist \epoc32\winscw\c\sys\install\sisregistry\80000086\*.ctl del \epoc32\winscw\c\sys\install\sisregistry\80000086\*.ctl > NUL
+
+call interpretsis -z .\romdrive -c .\cdrive -s \epoc32\winscw\c\tswi\tsis\data\int_nr_option_01.sis +nonremovablepkg -w info -l /epoc32/winscw/c/interpretsis_test_harness.txt > NUL
+call interpretsis -z .\romdrive -c .\cdrive -s \epoc32\winscw\c\tswi\tsis\data\sp_int_nr_option_01.sis +nonremovablepkg -w info -l /epoc32/winscw/c/interpretsis_test_harness.txt > NUL
+call interpretsis -z .\romdrive -c .\cdrive -s \epoc32\winscw\c\tswi\tsis\data\int_nr_option_01.sis -w info -l /epoc32/winscw/c/interpretsis_test_harness.txt > NUL
+
+if not %errorlevel%==0 GOTO LAST
+if not exist \epoc32\winscw\c\Documents mkdir \epoc32\winscw\c\Documents
+call xcopy .\cdrive\sys\install\sisregistry \epoc32\winscw\c\sys\install\sisregistry /S /Y > NUL
+call xcopy .\cdrive\Documents \epoc32\winscw\c\Documents /S /Y > NUL
+if exist \epoc32\winscw\c\sys\install\sisregistry\backup.lst del \epoc32\winscw\c\sys\install\sisregistry\backup.lst > NUL
+
+ECHO ***ERRORCODE*** %errorlevel% PASS>>/epoc32/winscw/c/interpretsis_test_harness.txt
+GOTO END
+:LAST
+ECHO ***ERRORCODE*** %errorlevel% FAIL>>/epoc32/winscw/c/interpretsis_test_harness.txt
+:END
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/secureswitools/swisistools/test/tinterpretsisinteg/int_nr_option-18_db.bat Mon Mar 15 12:41:05 2010 +0200
@@ -0,0 +1,54 @@
+@rem
+@rem Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+@rem All rights reserved.
+@rem This component and the accompanying materials are made available
+@rem under the terms of the License "Eclipse Public License v1.0"
+@rem which accompanies this distribution, and is available
+@rem at the URL "http://www.eclipse.org/legal/sfl-v10.html".
+@rem
+@rem Initial Contributors:
+@rem Nokia Corporation - initial contribution.
+@rem
+@rem Contributors:
+@rem
+@rem Description:
+@rem
+@ECHO OFF
+REM int_nr_option_18
+REM int_nr_option_18 - SA over SA(NR) + SP(NR). This is a positive testcase. Expected result : SIS file is Installed.
+
+IF NOT EXIST .\backup\cdrive mkdir .\backup\cdrive > NUL
+IF NOT EXIST .\backup\romdrive mkdir .\backup\romdrive > NUL
+if not exist .\cdrive mkdir .\cdrive > NUL
+if not exist .\cdrive\Documents mkdir .\cdrive\Documents > NUL
+if not exist .\romdrive mkdir .\romdrive > NUL
+if not exist .\romdrive\system\ mkdir .\romdrive\system\ > NUL
+if not exist .\romdrive\system\install\ mkdir .\romdrive\system\install\ > NUL
+REM Remove installation files from any previous tests
+if exist .\cdrive\Documents\InstTest\Equivalent*.txt del .\cdrive\Documents\InstTest\Equivalent*.txt > NUL
+
+xcopy /E /Y backup\cdrive cdrive > NUL
+xcopy /E /Y backup\romdrive romdrive > NUL
+
+REM Remove installation files from any previous tests
+if exist \epoc32\winscw\c\Documents\abc*.txt del \epoc32\winscw\c\Documents\abc*.txt > NUL
+if exist \epoc32\winscw\c\sys\install\sisregistry\80000086\*.reg del \epoc32\winscw\c\sys\install\sisregistry\80000086\*.reg > NUL
+if exist \epoc32\winscw\c\sys\install\sisregistry\80000086\*.ctl del \epoc32\winscw\c\sys\install\sisregistry\80000086\*.ctl > NUL
+
+call interpretsis -z .\romdrive -c .\cdrive -s \epoc32\winscw\c\tswi\tsis\data\int_nr_option_01.sis +nonremovablepkg -w info -l /epoc32/winscw/c/interpretsis_test_harness_db.txt > NUL
+call interpretsis -z .\romdrive -c .\cdrive -s \epoc32\winscw\c\tswi\tsis\data\sp_int_nr_option_01.sis +nonremovablepkg -w info -l /epoc32/winscw/c/interpretsis_test_harness_db.txt > NUL
+call interpretsis -z .\romdrive -c .\cdrive -s \epoc32\winscw\c\tswi\tsis\data\int_nr_option_01.sis -w info -l /epoc32/winscw/c/interpretsis_test_harness_db.txt > NUL
+
+if not %errorlevel%==0 GOTO LAST
+if not exist \epoc32\winscw\c\Documents mkdir \epoc32\winscw\c\Documents
+call xcopy .\cdrive\Documents \epoc32\winscw\c\Documents /S /Y > NUL
+call xcopy .\cdrive\sys\install\sisregistry \epoc32\winscw\c\sys\install\sisregistry /S /Y > NUL
+if exist \epoc32\winscw\c\sys\install\scr\scr.db del \epoc32\winscw\c\sys\install\scr\scr.db > NUL
+copy .\romdrive\sys\install\scr\provisioned\scr.db \epoc32\winscw\c\sys\install\scr\scr.db /Y > NUL
+if exist \epoc32\winscw\c\sys\install\sisregistry\backup.lst del \epoc32\winscw\c\sys\install\sisregistry\backup.lst > NUL
+
+ECHO ***ERRORCODE*** %errorlevel% PASS>>/epoc32/winscw/c/interpretsis_test_harness_db.txt
+GOTO END
+:LAST
+ECHO ***ERRORCODE*** %errorlevel% FAIL>>/epoc32/winscw/c/interpretsis_test_harness_db.txt
+:END
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/secureswitools/swisistools/test/tinterpretsisinteg/int_nr_option-19.bat Mon Mar 15 12:41:05 2010 +0200
@@ -0,0 +1,50 @@
+@rem
+@rem Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+@rem All rights reserved.
+@rem This component and the accompanying materials are made available
+@rem under the terms of the License "Eclipse Public License v1.0"
+@rem which accompanies this distribution, and is available
+@rem at the URL "http://www.eclipse.org/legal/sfl-v10.html".
+@rem
+@rem Initial Contributors:
+@rem Nokia Corporation - initial contribution.
+@rem
+@rem Contributors:
+@rem
+@rem Description:
+@rem
+@ECHO OFF
+REM int_nr_option_19
+REM int_nr_option_19 - SA(NR) over SA(NR) + SP(NR). This is a positive testcase. Expected result : SIS file is Installed.
+
+IF NOT EXIST .\backup\cdrive mkdir .\backup\cdrive > NUL
+IF NOT EXIST .\backup\romdrive mkdir .\backup\romdrive > NUL
+if not exist .\cdrive mkdir .\cdrive > NUL
+if not exist .\cdrive\Documents mkdir .\cdrive\Documents > NUL
+if not exist .\romdrive mkdir .\romdrive > NUL
+if not exist .\romdrive\system\ mkdir .\romdrive\system\ > NUL
+if not exist .\romdrive\system\install\ mkdir .\romdrive\system\install\ > NUL
+
+xcopy /E /Y backup\cdrive cdrive > NUL
+xcopy /E /Y backup\romdrive romdrive > NUL
+
+REM Remove installation files from any previous tests
+if exist \epoc32\winscw\c\Documents\abc*.txt del \epoc32\winscw\c\Documents\abc*.txt > NUL
+if exist \epoc32\winscw\c\sys\install\sisregistry\80000086\*.reg del \epoc32\winscw\c\sys\install\sisregistry\80000086\*.reg > NUL
+if exist \epoc32\winscw\c\sys\install\sisregistry\80000086\*.ctl del \epoc32\winscw\c\sys\install\sisregistry\80000086\*.ctl > NUL
+
+call interpretsis -z .\romdrive -c .\cdrive -s \epoc32\winscw\c\tswi\tsis\data\int_nr_option_01.sis +nonremovablepkg -w info -l /epoc32/winscw/c/interpretsis_test_harness.txt > NUL
+call interpretsis -z .\romdrive -c .\cdrive -s \epoc32\winscw\c\tswi\tsis\data\sp_int_nr_option_01.sis +nonremovablepkg -w info -l /epoc32/winscw/c/interpretsis_test_harness.txt > NUL
+call interpretsis -z .\romdrive -c .\cdrive -s \epoc32\winscw\c\tswi\tsis\data\int_nr_option_01.sis +nonremovablepkg -w info -l /epoc32/winscw/c/interpretsis_test_harness.txt > NUL
+
+if not %errorlevel%==0 GOTO LAST
+if not exist \epoc32\winscw\c\Documents mkdir \epoc32\winscw\c\Documents
+call xcopy .\cdrive\sys\install\sisregistry \epoc32\winscw\c\sys\install\sisregistry /S /Y > NUL
+call xcopy .\cdrive\Documents \epoc32\winscw\c\Documents /S /Y > NUL
+if exist \epoc32\winscw\c\sys\install\sisregistry\backup.lst del \epoc32\winscw\c\sys\install\sisregistry\backup.lst > NUL
+
+ECHO ***ERRORCODE*** %errorlevel% PASS>>/epoc32/winscw/c/interpretsis_test_harness.txt
+GOTO END
+:LAST
+ECHO ***ERRORCODE*** %errorlevel% FAIL>>/epoc32/winscw/c/interpretsis_test_harness.txt
+:END
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/secureswitools/swisistools/test/tinterpretsisinteg/int_nr_option-19_db.bat Mon Mar 15 12:41:05 2010 +0200
@@ -0,0 +1,54 @@
+@rem
+@rem Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+@rem All rights reserved.
+@rem This component and the accompanying materials are made available
+@rem under the terms of the License "Eclipse Public License v1.0"
+@rem which accompanies this distribution, and is available
+@rem at the URL "http://www.eclipse.org/legal/sfl-v10.html".
+@rem
+@rem Initial Contributors:
+@rem Nokia Corporation - initial contribution.
+@rem
+@rem Contributors:
+@rem
+@rem Description:
+@rem
+@ECHO OFF
+REM int_nr_option_19
+REM int_nr_option_19 - SA(NR) over SA(NR) + SP(NR). This is a positive testcase. Expected result : SIS file is Installed.
+
+IF NOT EXIST .\backup\cdrive mkdir .\backup\cdrive > NUL
+IF NOT EXIST .\backup\romdrive mkdir .\backup\romdrive > NUL
+if not exist .\cdrive mkdir .\cdrive > NUL
+if not exist .\cdrive\Documents mkdir .\cdrive\Documents > NUL
+if not exist .\romdrive mkdir .\romdrive > NUL
+if not exist .\romdrive\system\ mkdir .\romdrive\system\ > NUL
+if not exist .\romdrive\system\install\ mkdir .\romdrive\system\install\ > NUL
+REM Remove installation files from any previous tests
+if exist .\cdrive\Documents\InstTest\Equivalent*.txt del .\cdrive\Documents\InstTest\Equivalent*.txt > NUL
+
+xcopy /E /Y backup\cdrive cdrive > NUL
+xcopy /E /Y backup\romdrive romdrive > NUL
+
+REM Remove installation files from any previous tests
+if exist \epoc32\winscw\c\Documents\abc*.txt del \epoc32\winscw\c\Documents\abc*.txt > NUL
+if exist \epoc32\winscw\c\sys\install\sisregistry\80000086\*.reg del \epoc32\winscw\c\sys\install\sisregistry\80000086\*.reg > NUL
+if exist \epoc32\winscw\c\sys\install\sisregistry\80000086\*.ctl del \epoc32\winscw\c\sys\install\sisregistry\80000086\*.ctl > NUL
+
+call interpretsis -z .\romdrive -c .\cdrive -s \epoc32\winscw\c\tswi\tsis\data\int_nr_option_01.sis +nonremovablepkg -w info -l /epoc32/winscw/c/interpretsis_test_harness_db.txt > NUL
+call interpretsis -z .\romdrive -c .\cdrive -s \epoc32\winscw\c\tswi\tsis\data\sp_int_nr_option_01.sis +nonremovablepkg -w info -l /epoc32/winscw/c/interpretsis_test_harness_db.txt > NUL
+call interpretsis -z .\romdrive -c .\cdrive -s \epoc32\winscw\c\tswi\tsis\data\int_nr_option_01.sis +nonremovablepkg -w info -l /epoc32/winscw/c/interpretsis_test_harness_db.txt > NUL
+
+if not %errorlevel%==0 GOTO LAST
+if not exist \epoc32\winscw\c\Documents mkdir \epoc32\winscw\c\Documents
+call xcopy .\cdrive\Documents \epoc32\winscw\c\Documents /S /Y > NUL
+call xcopy .\cdrive\sys\install\sisregistry \epoc32\winscw\c\sys\install\sisregistry /S /Y > NUL
+if exist \epoc32\winscw\c\sys\install\scr\scr.db del \epoc32\winscw\c\sys\install\scr\scr.db > NUL
+copy .\romdrive\sys\install\scr\provisioned\scr.db \epoc32\winscw\c\sys\install\scr\scr.db /Y > NUL
+if exist \epoc32\winscw\c\sys\install\sisregistry\backup.lst del \epoc32\winscw\c\sys\install\sisregistry\backup.lst > NUL
+
+ECHO ***ERRORCODE*** %errorlevel% PASS>>/epoc32/winscw/c/interpretsis_test_harness_db.txt
+GOTO END
+:LAST
+ECHO ***ERRORCODE*** %errorlevel% FAIL>>/epoc32/winscw/c/interpretsis_test_harness_db.txt
+:END
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/secureswitools/swisistools/test/tinterpretsisinteg/int_nr_option-20.bat Mon Mar 15 12:41:05 2010 +0200
@@ -0,0 +1,50 @@
+@rem
+@rem Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+@rem All rights reserved.
+@rem This component and the accompanying materials are made available
+@rem under the terms of the License "Eclipse Public License v1.0"
+@rem which accompanies this distribution, and is available
+@rem at the URL "http://www.eclipse.org/legal/sfl-v10.html".
+@rem
+@rem Initial Contributors:
+@rem Nokia Corporation - initial contribution.
+@rem
+@rem Contributors:
+@rem
+@rem Description:
+@rem
+@ECHO OFF
+REM int_nr_option_20
+REM int_nr_option_20 - SP over SA + SP. This is a positive testcase. Expected result : SIS file is Installed.
+
+IF NOT EXIST .\backup\cdrive mkdir .\backup\cdrive > NUL
+IF NOT EXIST .\backup\romdrive mkdir .\backup\romdrive > NUL
+if not exist .\cdrive mkdir .\cdrive > NUL
+if not exist .\cdrive\Documents mkdir .\cdrive\Documents > NUL
+if not exist .\romdrive mkdir .\romdrive > NUL
+if not exist .\romdrive\system\ mkdir .\romdrive\system\ > NUL
+if not exist .\romdrive\system\install\ mkdir .\romdrive\system\install\ > NUL
+
+xcopy /E /Y backup\cdrive cdrive > NUL
+xcopy /E /Y backup\romdrive romdrive > NUL
+
+REM Remove installation files from any previous tests
+if exist \epoc32\winscw\c\Documents\abc*.txt del \epoc32\winscw\c\Documents\abc*.txt > NUL
+if exist \epoc32\winscw\c\sys\install\sisregistry\80000086\*.reg del \epoc32\winscw\c\sys\install\sisregistry\80000086\*.reg > NUL
+if exist \epoc32\winscw\c\sys\install\sisregistry\80000086\*.ctl del \epoc32\winscw\c\sys\install\sisregistry\80000086\*.ctl > NUL
+
+call interpretsis -z .\romdrive -c .\cdrive -s \epoc32\winscw\c\tswi\tsis\data\int_nr_option_01.sis -w info -l /epoc32/winscw/c/interpretsis_test_harness.txt > NUL
+call interpretsis -z .\romdrive -c .\cdrive -s \epoc32\winscw\c\tswi\tsis\data\sp_int_nr_option_01.sis -w info -l /epoc32/winscw/c/interpretsis_test_harness.txt > NUL
+call interpretsis -z .\romdrive -c .\cdrive -s \epoc32\winscw\c\tswi\tsis\data\sp_int_nr_option_01.sis -w info -l /epoc32/winscw/c/interpretsis_test_harness.txt > NUL
+
+if not %errorlevel%==0 GOTO LAST
+if not exist \epoc32\winscw\c\Documents mkdir \epoc32\winscw\c\Documents
+call xcopy .\cdrive\sys\install\sisregistry \epoc32\winscw\c\sys\install\sisregistry /S /Y > NUL
+call xcopy .\cdrive\Documents \epoc32\winscw\c\Documents /S /Y > NUL
+if exist \epoc32\winscw\c\sys\install\sisregistry\backup.lst del \epoc32\winscw\c\sys\install\sisregistry\backup.lst > NUL
+
+ECHO ***ERRORCODE*** %errorlevel% PASS>>/epoc32/winscw/c/interpretsis_test_harness.txt
+GOTO END
+:LAST
+ECHO ***ERRORCODE*** %errorlevel% FAIL>>/epoc32/winscw/c/interpretsis_test_harness.txt
+:END
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/secureswitools/swisistools/test/tinterpretsisinteg/int_nr_option-20_db.bat Mon Mar 15 12:41:05 2010 +0200
@@ -0,0 +1,54 @@
+@rem
+@rem Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+@rem All rights reserved.
+@rem This component and the accompanying materials are made available
+@rem under the terms of the License "Eclipse Public License v1.0"
+@rem which accompanies this distribution, and is available
+@rem at the URL "http://www.eclipse.org/legal/sfl-v10.html".
+@rem
+@rem Initial Contributors:
+@rem Nokia Corporation - initial contribution.
+@rem
+@rem Contributors:
+@rem
+@rem Description:
+@rem
+@ECHO OFF
+REM int_nr_option_20
+REM int_nr_option_20 - SP over SA + SP. This is a positive testcase. Expected result : SIS file is Installed.
+
+IF NOT EXIST .\backup\cdrive mkdir .\backup\cdrive > NUL
+IF NOT EXIST .\backup\romdrive mkdir .\backup\romdrive > NUL
+if not exist .\cdrive mkdir .\cdrive > NUL
+if not exist .\cdrive\Documents mkdir .\cdrive\Documents > NUL
+if not exist .\romdrive mkdir .\romdrive > NUL
+if not exist .\romdrive\system\ mkdir .\romdrive\system\ > NUL
+if not exist .\romdrive\system\install\ mkdir .\romdrive\system\install\ > NUL
+REM Remove installation files from any previous tests
+if exist .\cdrive\Documents\InstTest\Equivalent*.txt del .\cdrive\Documents\InstTest\Equivalent*.txt > NUL
+
+xcopy /E /Y backup\cdrive cdrive > NUL
+xcopy /E /Y backup\romdrive romdrive > NUL
+
+REM Remove installation files from any previous tests
+if exist \epoc32\winscw\c\Documents\abc*.txt del \epoc32\winscw\c\Documents\abc*.txt > NUL
+if exist \epoc32\winscw\c\sys\install\sisregistry\80000086\*.reg del \epoc32\winscw\c\sys\install\sisregistry\80000086\*.reg > NUL
+if exist \epoc32\winscw\c\sys\install\sisregistry\80000086\*.ctl del \epoc32\winscw\c\sys\install\sisregistry\80000086\*.ctl > NUL
+
+call interpretsis -z .\romdrive -c .\cdrive -s \epoc32\winscw\c\tswi\tsis\data\int_nr_option_01.sis -w info -l /epoc32/winscw/c/interpretsis_test_harness_db.txt > NUL
+call interpretsis -z .\romdrive -c .\cdrive -s \epoc32\winscw\c\tswi\tsis\data\sp_int_nr_option_01.sis -w info -l /epoc32/winscw/c/interpretsis_test_harness_db.txt > NUL
+call interpretsis -z .\romdrive -c .\cdrive -s \epoc32\winscw\c\tswi\tsis\data\sp_int_nr_option_01.sis -w info -l /epoc32/winscw/c/interpretsis_test_harness_db.txt > NUL
+
+if not %errorlevel%==0 GOTO LAST
+if not exist \epoc32\winscw\c\Documents mkdir \epoc32\winscw\c\Documents
+call xcopy .\cdrive\Documents \epoc32\winscw\c\Documents /S /Y > NUL
+call xcopy .\cdrive\sys\install\sisregistry \epoc32\winscw\c\sys\install\sisregistry /S /Y > NUL
+if exist \epoc32\winscw\c\sys\install\scr\scr.db del \epoc32\winscw\c\sys\install\scr\scr.db > NUL
+copy .\romdrive\sys\install\scr\provisioned\scr.db \epoc32\winscw\c\sys\install\scr\scr.db /Y > NUL
+if exist \epoc32\winscw\c\sys\install\sisregistry\backup.lst del \epoc32\winscw\c\sys\install\sisregistry\backup.lst > NUL
+
+ECHO ***ERRORCODE*** %errorlevel% PASS>>/epoc32/winscw/c/interpretsis_test_harness_db.txt
+GOTO END
+:LAST
+ECHO ***ERRORCODE*** %errorlevel% FAIL>>/epoc32/winscw/c/interpretsis_test_harness_db.txt
+:END
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/secureswitools/swisistools/test/tinterpretsisinteg/int_nr_option-21.bat Mon Mar 15 12:41:05 2010 +0200
@@ -0,0 +1,50 @@
+@rem
+@rem Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+@rem All rights reserved.
+@rem This component and the accompanying materials are made available
+@rem under the terms of the License "Eclipse Public License v1.0"
+@rem which accompanies this distribution, and is available
+@rem at the URL "http://www.eclipse.org/legal/sfl-v10.html".
+@rem
+@rem Initial Contributors:
+@rem Nokia Corporation - initial contribution.
+@rem
+@rem Contributors:
+@rem
+@rem Description:
+@rem
+@ECHO OFF
+REM int_nr_option_21
+REM int_nr_option_21 - SP over SA(NR) + SP. This is a positive testcase. Expected result : SIS file is Installed.
+
+IF NOT EXIST .\backup\cdrive mkdir .\backup\cdrive > NUL
+IF NOT EXIST .\backup\romdrive mkdir .\backup\romdrive > NUL
+if not exist .\cdrive mkdir .\cdrive > NUL
+if not exist .\cdrive\Documents mkdir .\cdrive\Documents > NUL
+if not exist .\romdrive mkdir .\romdrive > NUL
+if not exist .\romdrive\system\ mkdir .\romdrive\system\ > NUL
+if not exist .\romdrive\system\install\ mkdir .\romdrive\system\install\ > NUL
+
+xcopy /E /Y backup\cdrive cdrive > NUL
+xcopy /E /Y backup\romdrive romdrive > NUL
+
+REM Remove installation files from any previous tests
+if exist \epoc32\winscw\c\Documents\abc*.txt del \epoc32\winscw\c\Documents\abc*.txt > NUL
+if exist \epoc32\winscw\c\sys\install\sisregistry\80000086\*.reg del \epoc32\winscw\c\sys\install\sisregistry\80000086\*.reg > NUL
+if exist \epoc32\winscw\c\sys\install\sisregistry\80000086\*.ctl del \epoc32\winscw\c\sys\install\sisregistry\80000086\*.ctl > NUL
+
+call interpretsis -z .\romdrive -c .\cdrive -s \epoc32\winscw\c\tswi\tsis\data\int_nr_option_01.sis +nonremovablepkg -w info -l /epoc32/winscw/c/interpretsis_test_harness.txt > NUL
+call interpretsis -z .\romdrive -c .\cdrive -s \epoc32\winscw\c\tswi\tsis\data\sp_int_nr_option_01.sis -w info -l /epoc32/winscw/c/interpretsis_test_harness.txt > NUL
+call interpretsis -z .\romdrive -c .\cdrive -s \epoc32\winscw\c\tswi\tsis\data\sp_int_nr_option_01.sis -w info -l /epoc32/winscw/c/interpretsis_test_harness.txt > NUL
+
+if not %errorlevel%==0 GOTO LAST
+if not exist \epoc32\winscw\c\Documents mkdir \epoc32\winscw\c\Documents
+call xcopy .\cdrive\sys\install\sisregistry \epoc32\winscw\c\sys\install\sisregistry /S /Y > NUL
+call xcopy .\cdrive\Documents \epoc32\winscw\c\Documents /S /Y > NUL
+if exist \epoc32\winscw\c\sys\install\sisregistry\backup.lst del \epoc32\winscw\c\sys\install\sisregistry\backup.lst > NUL
+
+ECHO ***ERRORCODE*** %errorlevel% PASS>>/epoc32/winscw/c/interpretsis_test_harness.txt
+GOTO END
+:LAST
+ECHO ***ERRORCODE*** %errorlevel% FAIL>>/epoc32/winscw/c/interpretsis_test_harness.txt
+:END
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/secureswitools/swisistools/test/tinterpretsisinteg/int_nr_option-21_db.bat Mon Mar 15 12:41:05 2010 +0200
@@ -0,0 +1,54 @@
+@rem
+@rem Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+@rem All rights reserved.
+@rem This component and the accompanying materials are made available
+@rem under the terms of the License "Eclipse Public License v1.0"
+@rem which accompanies this distribution, and is available
+@rem at the URL "http://www.eclipse.org/legal/sfl-v10.html".
+@rem
+@rem Initial Contributors:
+@rem Nokia Corporation - initial contribution.
+@rem
+@rem Contributors:
+@rem
+@rem Description:
+@rem
+@ECHO OFF
+REM int_nr_option_21
+REM int_nr_option_21 - SP over SA(NR) + SP. This is a positive testcase. Expected result : SIS file is Installed.
+
+IF NOT EXIST .\backup\cdrive mkdir .\backup\cdrive > NUL
+IF NOT EXIST .\backup\romdrive mkdir .\backup\romdrive > NUL
+if not exist .\cdrive mkdir .\cdrive > NUL
+if not exist .\cdrive\Documents mkdir .\cdrive\Documents > NUL
+if not exist .\romdrive mkdir .\romdrive > NUL
+if not exist .\romdrive\system\ mkdir .\romdrive\system\ > NUL
+if not exist .\romdrive\system\install\ mkdir .\romdrive\system\install\ > NUL
+REM Remove installation files from any previous tests
+if exist .\cdrive\Documents\InstTest\Equivalent*.txt del .\cdrive\Documents\InstTest\Equivalent*.txt > NUL
+
+xcopy /E /Y backup\cdrive cdrive > NUL
+xcopy /E /Y backup\romdrive romdrive > NUL
+
+REM Remove installation files from any previous tests
+if exist \epoc32\winscw\c\Documents\abc*.txt del \epoc32\winscw\c\Documents\abc*.txt > NUL
+if exist \epoc32\winscw\c\sys\install\sisregistry\80000086\*.reg del \epoc32\winscw\c\sys\install\sisregistry\80000086\*.reg > NUL
+if exist \epoc32\winscw\c\sys\install\sisregistry\80000086\*.ctl del \epoc32\winscw\c\sys\install\sisregistry\80000086\*.ctl > NUL
+
+call interpretsis -z .\romdrive -c .\cdrive -s \epoc32\winscw\c\tswi\tsis\data\int_nr_option_01.sis +nonremovablepkg -w info -l /epoc32/winscw/c/interpretsis_test_harness_db.txt > NUL
+call interpretsis -z .\romdrive -c .\cdrive -s \epoc32\winscw\c\tswi\tsis\data\sp_int_nr_option_01.sis -w info -l /epoc32/winscw/c/interpretsis_test_harness_db.txt > NUL
+call interpretsis -z .\romdrive -c .\cdrive -s \epoc32\winscw\c\tswi\tsis\data\sp_int_nr_option_01.sis -w info -l /epoc32/winscw/c/interpretsis_test_harness_db.txt > NUL
+
+if not %errorlevel%==0 GOTO LAST
+if not exist \epoc32\winscw\c\Documents mkdir \epoc32\winscw\c\Documents
+call xcopy .\cdrive\Documents \epoc32\winscw\c\Documents /S /Y > NUL
+call xcopy .\cdrive\sys\install\sisregistry \epoc32\winscw\c\sys\install\sisregistry /S /Y > NUL
+if exist \epoc32\winscw\c\sys\install\scr\scr.db del \epoc32\winscw\c\sys\install\scr\scr.db > NUL
+copy .\romdrive\sys\install\scr\provisioned\scr.db \epoc32\winscw\c\sys\install\scr\scr.db /Y > NUL
+if exist \epoc32\winscw\c\sys\install\sisregistry\backup.lst del \epoc32\winscw\c\sys\install\sisregistry\backup.lst > NUL
+
+ECHO ***ERRORCODE*** %errorlevel% PASS>>/epoc32/winscw/c/interpretsis_test_harness_db.txt
+GOTO END
+:LAST
+ECHO ***ERRORCODE*** %errorlevel% FAIL>>/epoc32/winscw/c/interpretsis_test_harness_db.txt
+:END
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/secureswitools/swisistools/test/tinterpretsisinteg/int_nr_option-22.bat Mon Mar 15 12:41:05 2010 +0200
@@ -0,0 +1,50 @@
+@rem
+@rem Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+@rem All rights reserved.
+@rem This component and the accompanying materials are made available
+@rem under the terms of the License "Eclipse Public License v1.0"
+@rem which accompanies this distribution, and is available
+@rem at the URL "http://www.eclipse.org/legal/sfl-v10.html".
+@rem
+@rem Initial Contributors:
+@rem Nokia Corporation - initial contribution.
+@rem
+@rem Contributors:
+@rem
+@rem Description:
+@rem
+@ECHO OFF
+REM int_nr_option_22
+REM int_nr_option_22 - SP over SA(NR) + SP(NR). This is a positive testcase. Expected result : SIS file is Installed.
+
+IF NOT EXIST .\backup\cdrive mkdir .\backup\cdrive > NUL
+IF NOT EXIST .\backup\romdrive mkdir .\backup\romdrive > NUL
+if not exist .\cdrive mkdir .\cdrive > NUL
+if not exist .\cdrive\Documents mkdir .\cdrive\Documents > NUL
+if not exist .\romdrive mkdir .\romdrive > NUL
+if not exist .\romdrive\system\ mkdir .\romdrive\system\ > NUL
+if not exist .\romdrive\system\install\ mkdir .\romdrive\system\install\ > NUL
+
+xcopy /E /Y backup\cdrive cdrive > NUL
+xcopy /E /Y backup\romdrive romdrive > NUL
+
+REM Remove installation files from any previous tests
+if exist \epoc32\winscw\c\Documents\abc*.txt del \epoc32\winscw\c\Documents\abc*.txt > NUL
+if exist \epoc32\winscw\c\sys\install\sisregistry\80000086\*.reg del \epoc32\winscw\c\sys\install\sisregistry\80000086\*.reg > NUL
+if exist \epoc32\winscw\c\sys\install\sisregistry\80000086\*.ctl del \epoc32\winscw\c\sys\install\sisregistry\80000086\*.ctl > NUL
+
+call interpretsis -z .\romdrive -c .\cdrive -s \epoc32\winscw\c\tswi\tsis\data\int_nr_option_01.sis +nonremovablepkg -w info -l /epoc32/winscw/c/interpretsis_test_harness.txt > NUL
+call interpretsis -z .\romdrive -c .\cdrive -s \epoc32\winscw\c\tswi\tsis\data\sp_int_nr_option_01.sis +nonremovablepkg -w info -l /epoc32/winscw/c/interpretsis_test_harness.txt > NUL
+call interpretsis -z .\romdrive -c .\cdrive -s \epoc32\winscw\c\tswi\tsis\data\sp_int_nr_option_01.sis -w info -l /epoc32/winscw/c/interpretsis_test_harness.txt > NUL
+
+if not %errorlevel%==0 GOTO LAST
+if not exist \epoc32\winscw\c\Documents mkdir \epoc32\winscw\c\Documents
+call xcopy .\cdrive\sys\install\sisregistry \epoc32\winscw\c\sys\install\sisregistry /S /Y > NUL
+call xcopy .\cdrive\Documents \epoc32\winscw\c\Documents /S /Y > NUL
+if exist \epoc32\winscw\c\sys\install\sisregistry\backup.lst del \epoc32\winscw\c\sys\install\sisregistry\backup.lst > NUL
+
+ECHO ***ERRORCODE*** %errorlevel% PASS>>/epoc32/winscw/c/interpretsis_test_harness.txt
+GOTO END
+:LAST
+ECHO ***ERRORCODE*** %errorlevel% FAIL>>/epoc32/winscw/c/interpretsis_test_harness.txt
+:END
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/secureswitools/swisistools/test/tinterpretsisinteg/int_nr_option-22_db.bat Mon Mar 15 12:41:05 2010 +0200
@@ -0,0 +1,54 @@
+@rem
+@rem Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+@rem All rights reserved.
+@rem This component and the accompanying materials are made available
+@rem under the terms of the License "Eclipse Public License v1.0"
+@rem which accompanies this distribution, and is available
+@rem at the URL "http://www.eclipse.org/legal/sfl-v10.html".
+@rem
+@rem Initial Contributors:
+@rem Nokia Corporation - initial contribution.
+@rem
+@rem Contributors:
+@rem
+@rem Description:
+@rem
+@ECHO OFF
+REM int_nr_option_22
+REM int_nr_option_22 - SP over SA(NR) + SP(NR). This is a positive testcase. Expected result : SIS file is Installed.
+
+IF NOT EXIST .\backup\cdrive mkdir .\backup\cdrive > NUL
+IF NOT EXIST .\backup\romdrive mkdir .\backup\romdrive > NUL
+if not exist .\cdrive mkdir .\cdrive > NUL
+if not exist .\cdrive\Documents mkdir .\cdrive\Documents > NUL
+if not exist .\romdrive mkdir .\romdrive > NUL
+if not exist .\romdrive\system\ mkdir .\romdrive\system\ > NUL
+if not exist .\romdrive\system\install\ mkdir .\romdrive\system\install\ > NUL
+REM Remove installation files from any previous tests
+if exist .\cdrive\Documents\InstTest\Equivalent*.txt del .\cdrive\Documents\InstTest\Equivalent*.txt > NUL
+
+xcopy /E /Y backup\cdrive cdrive > NUL
+xcopy /E /Y backup\romdrive romdrive > NUL
+
+REM Remove installation files from any previous tests
+if exist \epoc32\winscw\c\Documents\abc*.txt del \epoc32\winscw\c\Documents\abc*.txt > NUL
+if exist \epoc32\winscw\c\sys\install\sisregistry\80000086\*.reg del \epoc32\winscw\c\sys\install\sisregistry\80000086\*.reg > NUL
+if exist \epoc32\winscw\c\sys\install\sisregistry\80000086\*.ctl del \epoc32\winscw\c\sys\install\sisregistry\80000086\*.ctl > NUL
+
+call interpretsis -z .\romdrive -c .\cdrive -s \epoc32\winscw\c\tswi\tsis\data\int_nr_option_01.sis +nonremovablepkg -w info -l /epoc32/winscw/c/interpretsis_test_harness_db.txt > NUL
+call interpretsis -z .\romdrive -c .\cdrive -s \epoc32\winscw\c\tswi\tsis\data\sp_int_nr_option_01.sis +nonremovablepkg -w info -l /epoc32/winscw/c/interpretsis_test_harness_db.txt > NUL
+call interpretsis -z .\romdrive -c .\cdrive -s \epoc32\winscw\c\tswi\tsis\data\sp_int_nr_option_01.sis -w info -l /epoc32/winscw/c/interpretsis_test_harness_db.txt > NUL
+
+if not %errorlevel%==0 GOTO LAST
+if not exist \epoc32\winscw\c\Documents mkdir \epoc32\winscw\c\Documents
+call xcopy .\cdrive\Documents \epoc32\winscw\c\Documents /S /Y > NUL
+call xcopy .\cdrive\sys\install\sisregistry \epoc32\winscw\c\sys\install\sisregistry /S /Y > NUL
+if exist \epoc32\winscw\c\sys\install\scr\scr.db del \epoc32\winscw\c\sys\install\scr\scr.db > NUL
+copy .\romdrive\sys\install\scr\provisioned\scr.db \epoc32\winscw\c\sys\install\scr\scr.db /Y > NUL
+if exist \epoc32\winscw\c\sys\install\sisregistry\backup.lst del \epoc32\winscw\c\sys\install\sisregistry\backup.lst > NUL
+
+ECHO ***ERRORCODE*** %errorlevel% PASS>>/epoc32/winscw/c/interpretsis_test_harness_db.txt
+GOTO END
+:LAST
+ECHO ***ERRORCODE*** %errorlevel% FAIL>>/epoc32/winscw/c/interpretsis_test_harness_db.txt
+:END
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/secureswitools/swisistools/test/tinterpretsisinteg/int_nr_option-23.bat Mon Mar 15 12:41:05 2010 +0200
@@ -0,0 +1,50 @@
+@rem
+@rem Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+@rem All rights reserved.
+@rem This component and the accompanying materials are made available
+@rem under the terms of the License "Eclipse Public License v1.0"
+@rem which accompanies this distribution, and is available
+@rem at the URL "http://www.eclipse.org/legal/sfl-v10.html".
+@rem
+@rem Initial Contributors:
+@rem Nokia Corporation - initial contribution.
+@rem
+@rem Contributors:
+@rem
+@rem Description:
+@rem
+@ECHO OFF
+REM int_nr_option_23
+REM int_nr_option_23 - SP(NR) over SA + SP. This is a positive testcase. Expected result : SIS file is not Installed.
+
+IF NOT EXIST .\backup\cdrive mkdir .\backup\cdrive > NUL
+IF NOT EXIST .\backup\romdrive mkdir .\backup\romdrive > NUL
+if not exist .\cdrive mkdir .\cdrive > NUL
+if not exist .\cdrive\Documents mkdir .\cdrive\Documents > NUL
+if not exist .\romdrive mkdir .\romdrive > NUL
+if not exist .\romdrive\system\ mkdir .\romdrive\system\ > NUL
+if not exist .\romdrive\system\install\ mkdir .\romdrive\system\install\ > NUL
+
+xcopy /E /Y backup\cdrive cdrive > NUL
+xcopy /E /Y backup\romdrive romdrive > NUL
+
+REM Remove installation files from any previous tests
+if exist \epoc32\winscw\c\Documents\abc*.txt del \epoc32\winscw\c\Documents\abc*.txt > NUL
+if exist \epoc32\winscw\c\sys\install\sisregistry\80000086\*.reg del \epoc32\winscw\c\sys\install\sisregistry\80000086\*.reg > NUL
+if exist \epoc32\winscw\c\sys\install\sisregistry\80000086\*.ctl del \epoc32\winscw\c\sys\install\sisregistry\80000086\*.ctl > NUL
+
+call interpretsis -z .\romdrive -c .\cdrive -s \epoc32\winscw\c\tswi\tsis\data\int_nr_option_01.sis -w info -l /epoc32/winscw/c/interpretsis_test_harness.txt > NUL
+call interpretsis -z .\romdrive -c .\cdrive -s \epoc32\winscw\c\tswi\tsis\data\sp_int_nr_option_01.sis -w info -l /epoc32/winscw/c/interpretsis_test_harness.txt > NUL
+call interpretsis -z .\romdrive -c .\cdrive -s \epoc32\winscw\c\tswi\tsis\data\sp_int_nr_option_01.sis +nonremovablepkg -w info -l /epoc32/winscw/c/interpretsis_test_harness.txt > NUL
+
+if not %errorlevel%==0 GOTO LAST
+if not exist \epoc32\winscw\c\Documents mkdir \epoc32\winscw\c\Documents
+call xcopy .\cdrive\sys\install\sisregistry \epoc32\winscw\c\sys\install\sisregistry /S /Y > NUL
+call xcopy .\cdrive\Documents \epoc32\winscw\c\Documents /S /Y > NUL
+if exist \epoc32\winscw\c\sys\install\sisregistry\backup.lst del \epoc32\winscw\c\sys\install\sisregistry\backup.lst > NUL
+
+ECHO ***ERRORCODE*** %errorlevel% PASS>>/epoc32/winscw/c/interpretsis_test_harness.txt
+GOTO END
+:LAST
+ECHO ***ERRORCODE*** %errorlevel% FAIL>>/epoc32/winscw/c/interpretsis_test_harness.txt
+:END
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/secureswitools/swisistools/test/tinterpretsisinteg/int_nr_option-23_db.bat Mon Mar 15 12:41:05 2010 +0200
@@ -0,0 +1,54 @@
+@rem
+@rem Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+@rem All rights reserved.
+@rem This component and the accompanying materials are made available
+@rem under the terms of the License "Eclipse Public License v1.0"
+@rem which accompanies this distribution, and is available
+@rem at the URL "http://www.eclipse.org/legal/sfl-v10.html".
+@rem
+@rem Initial Contributors:
+@rem Nokia Corporation - initial contribution.
+@rem
+@rem Contributors:
+@rem
+@rem Description:
+@rem
+@ECHO OFF
+REM int_nr_option_23
+REM int_nr_option_23 - SP(NR) over SA + SP. This is a positive testcase. Expected result : SIS file is not Installed.
+
+IF NOT EXIST .\backup\cdrive mkdir .\backup\cdrive > NUL
+IF NOT EXIST .\backup\romdrive mkdir .\backup\romdrive > NUL
+if not exist .\cdrive mkdir .\cdrive > NUL
+if not exist .\cdrive\Documents mkdir .\cdrive\Documents > NUL
+if not exist .\romdrive mkdir .\romdrive > NUL
+if not exist .\romdrive\system\ mkdir .\romdrive\system\ > NUL
+if not exist .\romdrive\system\install\ mkdir .\romdrive\system\install\ > NUL
+REM Remove installation files from any previous tests
+if exist .\cdrive\Documents\InstTest\Equivalent*.txt del .\cdrive\Documents\InstTest\Equivalent*.txt > NUL
+
+xcopy /E /Y backup\cdrive cdrive > NUL
+xcopy /E /Y backup\romdrive romdrive > NUL
+
+REM Remove installation files from any previous tests
+if exist \epoc32\winscw\c\Documents\abc*.txt del \epoc32\winscw\c\Documents\abc*.txt > NUL
+if exist \epoc32\winscw\c\sys\install\sisregistry\80000086\*.reg del \epoc32\winscw\c\sys\install\sisregistry\80000086\*.reg > NUL
+if exist \epoc32\winscw\c\sys\install\sisregistry\80000086\*.ctl del \epoc32\winscw\c\sys\install\sisregistry\80000086\*.ctl > NUL
+
+call interpretsis -z .\romdrive -c .\cdrive -s \epoc32\winscw\c\tswi\tsis\data\int_nr_option_01.sis -w info -l /epoc32/winscw/c/interpretsis_test_harness_db.txt > NUL
+call interpretsis -z .\romdrive -c .\cdrive -s \epoc32\winscw\c\tswi\tsis\data\sp_int_nr_option_01.sis -w info -l /epoc32/winscw/c/interpretsis_test_harness_db.txt > NUL
+call interpretsis -z .\romdrive -c .\cdrive -s \epoc32\winscw\c\tswi\tsis\data\sp_int_nr_option_01.sis +nonremovablepkg -w info -l /epoc32/winscw/c/interpretsis_test_harness_db.txt > NUL
+
+if not %errorlevel%==0 GOTO LAST
+if not exist \epoc32\winscw\c\Documents mkdir \epoc32\winscw\c\Documents
+call xcopy .\cdrive\Documents \epoc32\winscw\c\Documents /S /Y > NUL
+call xcopy .\cdrive\sys\install\sisregistry \epoc32\winscw\c\sys\install\sisregistry /S /Y > NUL
+if exist \epoc32\winscw\c\sys\install\scr\scr.db del \epoc32\winscw\c\sys\install\scr\scr.db > NUL
+copy .\romdrive\sys\install\scr\provisioned\scr.db \epoc32\winscw\c\sys\install\scr\scr.db /Y > NUL
+if exist \epoc32\winscw\c\sys\install\sisregistry\backup.lst del \epoc32\winscw\c\sys\install\sisregistry\backup.lst > NUL
+
+ECHO ***ERRORCODE*** %errorlevel% PASS>>/epoc32/winscw/c/interpretsis_test_harness_db.txt
+GOTO END
+:LAST
+ECHO ***ERRORCODE*** %errorlevel% FAIL>>/epoc32/winscw/c/interpretsis_test_harness_db.txt
+:END
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/secureswitools/swisistools/test/tinterpretsisinteg/int_nr_option-24.bat Mon Mar 15 12:41:05 2010 +0200
@@ -0,0 +1,50 @@
+@rem
+@rem Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+@rem All rights reserved.
+@rem This component and the accompanying materials are made available
+@rem under the terms of the License "Eclipse Public License v1.0"
+@rem which accompanies this distribution, and is available
+@rem at the URL "http://www.eclipse.org/legal/sfl-v10.html".
+@rem
+@rem Initial Contributors:
+@rem Nokia Corporation - initial contribution.
+@rem
+@rem Contributors:
+@rem
+@rem Description:
+@rem
+@ECHO OFF
+REM int_nr_option_24
+REM int_nr_option_24 - SP(NR) over SA(NR) + SP. This is a positive testcase. Expected result : SIS file is Installed.
+
+IF NOT EXIST .\backup\cdrive mkdir .\backup\cdrive > NUL
+IF NOT EXIST .\backup\romdrive mkdir .\backup\romdrive > NUL
+if not exist .\cdrive mkdir .\cdrive > NUL
+if not exist .\cdrive\Documents mkdir .\cdrive\Documents > NUL
+if not exist .\romdrive mkdir .\romdrive > NUL
+if not exist .\romdrive\system\ mkdir .\romdrive\system\ > NUL
+if not exist .\romdrive\system\install\ mkdir .\romdrive\system\install\ > NUL
+
+xcopy /E /Y backup\cdrive cdrive > NUL
+xcopy /E /Y backup\romdrive romdrive > NUL
+
+REM Remove installation files from any previous tests
+if exist \epoc32\winscw\c\Documents\abc*.txt del \epoc32\winscw\c\Documents\abc*.txt > NUL
+if exist \epoc32\winscw\c\sys\install\sisregistry\80000086\*.reg del \epoc32\winscw\c\sys\install\sisregistry\80000086\*.reg > NUL
+if exist \epoc32\winscw\c\sys\install\sisregistry\80000086\*.ctl del \epoc32\winscw\c\sys\install\sisregistry\80000086\*.ctl > NUL
+
+call interpretsis -z .\romdrive -c .\cdrive -s \epoc32\winscw\c\tswi\tsis\data\int_nr_option_01.sis +nonremovablepkg -w info -l /epoc32/winscw/c/interpretsis_test_harness.txt > NUL
+call interpretsis -z .\romdrive -c .\cdrive -s \epoc32\winscw\c\tswi\tsis\data\sp_int_nr_option_01.sis -w info -l /epoc32/winscw/c/interpretsis_test_harness.txt > NUL
+call interpretsis -z .\romdrive -c .\cdrive -s \epoc32\winscw\c\tswi\tsis\data\sp_int_nr_option_01.sis +nonremovablepkg -w info -l /epoc32/winscw/c/interpretsis_test_harness.txt > NUL
+
+if not %errorlevel%==0 GOTO LAST
+if not exist \epoc32\winscw\c\Documents mkdir \epoc32\winscw\c\Documents
+call xcopy .\cdrive\sys\install\sisregistry \epoc32\winscw\c\sys\install\sisregistry /S /Y > NUL
+call xcopy .\cdrive\Documents \epoc32\winscw\c\Documents /S /Y > NUL
+if exist \epoc32\winscw\c\sys\install\sisregistry\backup.lst del \epoc32\winscw\c\sys\install\sisregistry\backup.lst > NUL
+
+ECHO ***ERRORCODE*** %errorlevel% PASS>>/epoc32/winscw/c/interpretsis_test_harness.txt
+GOTO END
+:LAST
+ECHO ***ERRORCODE*** %errorlevel% FAIL>>/epoc32/winscw/c/interpretsis_test_harness.txt
+:END
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/secureswitools/swisistools/test/tinterpretsisinteg/int_nr_option-24_db.bat Mon Mar 15 12:41:05 2010 +0200
@@ -0,0 +1,54 @@
+@rem
+@rem Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+@rem All rights reserved.
+@rem This component and the accompanying materials are made available
+@rem under the terms of the License "Eclipse Public License v1.0"
+@rem which accompanies this distribution, and is available
+@rem at the URL "http://www.eclipse.org/legal/sfl-v10.html".
+@rem
+@rem Initial Contributors:
+@rem Nokia Corporation - initial contribution.
+@rem
+@rem Contributors:
+@rem
+@rem Description:
+@rem
+@ECHO OFF
+REM int_nr_option_24
+REM int_nr_option_24 - SP(NR) over SA(NR) + SP. This is a positive testcase. Expected result : SIS file is Installed.
+
+IF NOT EXIST .\backup\cdrive mkdir .\backup\cdrive > NUL
+IF NOT EXIST .\backup\romdrive mkdir .\backup\romdrive > NUL
+if not exist .\cdrive mkdir .\cdrive > NUL
+if not exist .\cdrive\Documents mkdir .\cdrive\Documents > NUL
+if not exist .\romdrive mkdir .\romdrive > NUL
+if not exist .\romdrive\system\ mkdir .\romdrive\system\ > NUL
+if not exist .\romdrive\system\install\ mkdir .\romdrive\system\install\ > NUL
+REM Remove installation files from any previous tests
+if exist .\cdrive\Documents\InstTest\Equivalent*.txt del .\cdrive\Documents\InstTest\Equivalent*.txt > NUL
+
+xcopy /E /Y backup\cdrive cdrive > NUL
+xcopy /E /Y backup\romdrive romdrive > NUL
+
+REM Remove installation files from any previous tests
+if exist \epoc32\winscw\c\Documents\abc*.txt del \epoc32\winscw\c\Documents\abc*.txt > NUL
+if exist \epoc32\winscw\c\sys\install\sisregistry\80000086\*.reg del \epoc32\winscw\c\sys\install\sisregistry\80000086\*.reg > NUL
+if exist \epoc32\winscw\c\sys\install\sisregistry\80000086\*.ctl del \epoc32\winscw\c\sys\install\sisregistry\80000086\*.ctl > NUL
+
+call interpretsis -z .\romdrive -c .\cdrive -s \epoc32\winscw\c\tswi\tsis\data\int_nr_option_01.sis +nonremovablepkg -w info -l /epoc32/winscw/c/interpretsis_test_harness_db.txt > NUL
+call interpretsis -z .\romdrive -c .\cdrive -s \epoc32\winscw\c\tswi\tsis\data\sp_int_nr_option_01.sis -w info -l /epoc32/winscw/c/interpretsis_test_harness_db.txt > NUL
+call interpretsis -z .\romdrive -c .\cdrive -s \epoc32\winscw\c\tswi\tsis\data\sp_int_nr_option_01.sis +nonremovablepkg -w info -l /epoc32/winscw/c/interpretsis_test_harness_db.txt > NUL
+
+if not %errorlevel%==0 GOTO LAST
+if not exist \epoc32\winscw\c\Documents mkdir \epoc32\winscw\c\Documents
+call xcopy .\cdrive\Documents \epoc32\winscw\c\Documents /S /Y > NUL
+call xcopy .\cdrive\sys\install\sisregistry \epoc32\winscw\c\sys\install\sisregistry /S /Y > NUL
+if exist \epoc32\winscw\c\sys\install\scr\scr.db del \epoc32\winscw\c\sys\install\scr\scr.db > NUL
+copy .\romdrive\sys\install\scr\provisioned\scr.db \epoc32\winscw\c\sys\install\scr\scr.db /Y > NUL
+if exist \epoc32\winscw\c\sys\install\sisregistry\backup.lst del \epoc32\winscw\c\sys\install\sisregistry\backup.lst > NUL
+
+ECHO ***ERRORCODE*** %errorlevel% PASS>>/epoc32/winscw/c/interpretsis_test_harness_db.txt
+GOTO END
+:LAST
+ECHO ***ERRORCODE*** %errorlevel% FAIL>>/epoc32/winscw/c/interpretsis_test_harness_db.txt
+:END
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/secureswitools/swisistools/test/tinterpretsisinteg/int_nr_option-25.bat Mon Mar 15 12:41:05 2010 +0200
@@ -0,0 +1,50 @@
+@rem
+@rem Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+@rem All rights reserved.
+@rem This component and the accompanying materials are made available
+@rem under the terms of the License "Eclipse Public License v1.0"
+@rem which accompanies this distribution, and is available
+@rem at the URL "http://www.eclipse.org/legal/sfl-v10.html".
+@rem
+@rem Initial Contributors:
+@rem Nokia Corporation - initial contribution.
+@rem
+@rem Contributors:
+@rem
+@rem Description:
+@rem
+@ECHO OFF
+REM int_nr_option_25
+REM int_nr_option_25 - SP(NR) over SA(NR) + SP(NR). This is a positive testcase. Expected result : SIS file is Installed.
+
+IF NOT EXIST .\backup\cdrive mkdir .\backup\cdrive > NUL
+IF NOT EXIST .\backup\romdrive mkdir .\backup\romdrive > NUL
+if not exist .\cdrive mkdir .\cdrive > NUL
+if not exist .\cdrive\Documents mkdir .\cdrive\Documents > NUL
+if not exist .\romdrive mkdir .\romdrive > NUL
+if not exist .\romdrive\system\ mkdir .\romdrive\system\ > NUL
+if not exist .\romdrive\system\install\ mkdir .\romdrive\system\install\ > NUL
+
+xcopy /E /Y backup\cdrive cdrive > NUL
+xcopy /E /Y backup\romdrive romdrive > NUL
+
+REM Remove installation files from any previous tests
+if exist \epoc32\winscw\c\Documents\abc*.txt del \epoc32\winscw\c\Documents\abc*.txt > NUL
+if exist \epoc32\winscw\c\sys\install\sisregistry\80000086\*.reg del \epoc32\winscw\c\sys\install\sisregistry\80000086\*.reg > NUL
+if exist \epoc32\winscw\c\sys\install\sisregistry\80000086\*.ctl del \epoc32\winscw\c\sys\install\sisregistry\80000086\*.ctl > NUL
+
+call interpretsis -z .\romdrive -c .\cdrive -s \epoc32\winscw\c\tswi\tsis\data\int_nr_option_01.sis +nonremovablepkg -w info -l /epoc32/winscw/c/interpretsis_test_harness.txt > NUL
+call interpretsis -z .\romdrive -c .\cdrive -s \epoc32\winscw\c\tswi\tsis\data\sp_int_nr_option_01.sis +nonremovablepkg -w info -l /epoc32/winscw/c/interpretsis_test_harness.txt > NUL
+call interpretsis -z .\romdrive -c .\cdrive -s \epoc32\winscw\c\tswi\tsis\data\sp_int_nr_option_01.sis +nonremovablepkg -w info -l /epoc32/winscw/c/interpretsis_test_harness.txt > NUL
+
+if not %errorlevel%==0 GOTO LAST
+if not exist \epoc32\winscw\c\Documents mkdir \epoc32\winscw\c\Documents
+call xcopy .\cdrive\sys\install\sisregistry \epoc32\winscw\c\sys\install\sisregistry /S /Y > NUL
+call xcopy .\cdrive\Documents \epoc32\winscw\c\Documents /S /Y > NUL
+if exist \epoc32\winscw\c\sys\install\sisregistry\backup.lst del \epoc32\winscw\c\sys\install\sisregistry\backup.lst > NUL
+
+ECHO ***ERRORCODE*** %errorlevel% PASS>>/epoc32/winscw/c/interpretsis_test_harness.txt
+GOTO END
+:LAST
+ECHO ***ERRORCODE*** %errorlevel% FAIL>>/epoc32/winscw/c/interpretsis_test_harness.txt
+:END
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/secureswitools/swisistools/test/tinterpretsisinteg/int_nr_option-25_db.bat Mon Mar 15 12:41:05 2010 +0200
@@ -0,0 +1,54 @@
+@rem
+@rem Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+@rem All rights reserved.
+@rem This component and the accompanying materials are made available
+@rem under the terms of the License "Eclipse Public License v1.0"
+@rem which accompanies this distribution, and is available
+@rem at the URL "http://www.eclipse.org/legal/sfl-v10.html".
+@rem
+@rem Initial Contributors:
+@rem Nokia Corporation - initial contribution.
+@rem
+@rem Contributors:
+@rem
+@rem Description:
+@rem
+@ECHO OFF
+REM int_nr_option_25
+REM int_nr_option_25 - SP(NR) over SA(NR) + SP(NR). This is a positive testcase. Expected result : SIS file is Installed.
+
+IF NOT EXIST .\backup\cdrive mkdir .\backup\cdrive > NUL
+IF NOT EXIST .\backup\romdrive mkdir .\backup\romdrive > NUL
+if not exist .\cdrive mkdir .\cdrive > NUL
+if not exist .\cdrive\Documents mkdir .\cdrive\Documents > NUL
+if not exist .\romdrive mkdir .\romdrive > NUL
+if not exist .\romdrive\system\ mkdir .\romdrive\system\ > NUL
+if not exist .\romdrive\system\install\ mkdir .\romdrive\system\install\ > NUL
+REM Remove installation files from any previous tests
+if exist .\cdrive\Documents\InstTest\Equivalent*.txt del .\cdrive\Documents\InstTest\Equivalent*.txt > NUL
+
+xcopy /E /Y backup\cdrive cdrive > NUL
+xcopy /E /Y backup\romdrive romdrive > NUL
+
+REM Remove installation files from any previous tests
+if exist \epoc32\winscw\c\Documents\abc*.txt del \epoc32\winscw\c\Documents\abc*.txt > NUL
+if exist \epoc32\winscw\c\sys\install\sisregistry\80000086\*.reg del \epoc32\winscw\c\sys\install\sisregistry\80000086\*.reg > NUL
+if exist \epoc32\winscw\c\sys\install\sisregistry\80000086\*.ctl del \epoc32\winscw\c\sys\install\sisregistry\80000086\*.ctl > NUL
+
+call interpretsis -z .\romdrive -c .\cdrive -s \epoc32\winscw\c\tswi\tsis\data\int_nr_option_01.sis +nonremovablepkg -w info -l /epoc32/winscw/c/interpretsis_test_harness_db.txt > NUL
+call interpretsis -z .\romdrive -c .\cdrive -s \epoc32\winscw\c\tswi\tsis\data\sp_int_nr_option_01.sis +nonremovablepkg -w info -l /epoc32/winscw/c/interpretsis_test_harness_db.txt > NUL
+call interpretsis -z .\romdrive -c .\cdrive -s \epoc32\winscw\c\tswi\tsis\data\sp_int_nr_option_01.sis +nonremovablepkg -w info -l /epoc32/winscw/c/interpretsis_test_harness_db.txt > NUL
+
+if not %errorlevel%==0 GOTO LAST
+if not exist \epoc32\winscw\c\Documents mkdir \epoc32\winscw\c\Documents
+call xcopy .\cdrive\Documents \epoc32\winscw\c\Documents /S /Y > NUL
+call xcopy .\cdrive\sys\install\sisregistry \epoc32\winscw\c\sys\install\sisregistry /S /Y > NUL
+if exist \epoc32\winscw\c\sys\install\scr\scr.db del \epoc32\winscw\c\sys\install\scr\scr.db > NUL
+copy .\romdrive\sys\install\scr\provisioned\scr.db \epoc32\winscw\c\sys\install\scr\scr.db /Y > NUL
+if exist \epoc32\winscw\c\sys\install\sisregistry\backup.lst del \epoc32\winscw\c\sys\install\sisregistry\backup.lst > NUL
+
+ECHO ***ERRORCODE*** %errorlevel% PASS>>/epoc32/winscw/c/interpretsis_test_harness_db.txt
+GOTO END
+:LAST
+ECHO ***ERRORCODE*** %errorlevel% FAIL>>/epoc32/winscw/c/interpretsis_test_harness_db.txt
+:END
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/secureswitools/swisistools/test/tinterpretsisinteg/int_nr_option-26.bat Mon Mar 15 12:41:05 2010 +0200
@@ -0,0 +1,50 @@
+@rem
+@rem Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+@rem All rights reserved.
+@rem This component and the accompanying materials are made available
+@rem under the terms of the License "Eclipse Public License v1.0"
+@rem which accompanies this distribution, and is available
+@rem at the URL "http://www.eclipse.org/legal/sfl-v10.html".
+@rem
+@rem Initial Contributors:
+@rem Nokia Corporation - initial contribution.
+@rem
+@rem Contributors:
+@rem
+@rem Description:
+@rem
+@ECHO OFF
+REM int_nr_option_26
+REM int_nr_option_26 - PU over SA + SP. This is a positive testcase. Expected result : SIS file is Installed.
+
+IF NOT EXIST .\backup\cdrive mkdir .\backup\cdrive > NUL
+IF NOT EXIST .\backup\romdrive mkdir .\backup\romdrive > NUL
+if not exist .\cdrive mkdir .\cdrive > NUL
+if not exist .\cdrive\Documents mkdir .\cdrive\Documents > NUL
+if not exist .\romdrive mkdir .\romdrive > NUL
+if not exist .\romdrive\system\ mkdir .\romdrive\system\ > NUL
+if not exist .\romdrive\system\install\ mkdir .\romdrive\system\install\ > NUL
+
+xcopy /E /Y backup\cdrive cdrive > NUL
+xcopy /E /Y backup\romdrive romdrive > NUL
+
+REM Remove installation files from any previous tests
+if exist \epoc32\winscw\c\Documents\abc*.txt del \epoc32\winscw\c\Documents\abc*.txt > NUL
+if exist \epoc32\winscw\c\sys\install\sisregistry\80000086\*.reg del \epoc32\winscw\c\sys\install\sisregistry\80000086\*.reg > NUL
+if exist \epoc32\winscw\c\sys\install\sisregistry\80000086\*.ctl del \epoc32\winscw\c\sys\install\sisregistry\80000086\*.ctl > NUL
+
+call interpretsis -z .\romdrive -c .\cdrive -s \epoc32\winscw\c\tswi\tsis\data\int_nr_option_01.sis -w info -l /epoc32/winscw/c/interpretsis_test_harness.txt > NUL
+call interpretsis -z .\romdrive -c .\cdrive -s \epoc32\winscw\c\tswi\tsis\data\sp_int_nr_option_01.sis -w info -l /epoc32/winscw/c/interpretsis_test_harness.txt > NUL
+call interpretsis -z .\romdrive -c .\cdrive -s \epoc32\winscw\c\tswi\tsis\data\pu_int_nr_option_01.sis -w info -l /epoc32/winscw/c/interpretsis_test_harness.txt > NUL
+
+if not %errorlevel%==0 GOTO LAST
+if not exist \epoc32\winscw\c\Documents mkdir \epoc32\winscw\c\Documents
+call xcopy .\cdrive\sys\install\sisregistry \epoc32\winscw\c\sys\install\sisregistry /S /Y > NUL
+call xcopy .\cdrive\Documents \epoc32\winscw\c\Documents /S /Y > NUL
+if exist \epoc32\winscw\c\sys\install\sisregistry\backup.lst del \epoc32\winscw\c\sys\install\sisregistry\backup.lst > NUL
+
+ECHO ***ERRORCODE*** %errorlevel% PASS>>/epoc32/winscw/c/interpretsis_test_harness.txt
+GOTO END
+:LAST
+ECHO ***ERRORCODE*** %errorlevel% FAIL>>/epoc32/winscw/c/interpretsis_test_harness.txt
+:END
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/secureswitools/swisistools/test/tinterpretsisinteg/int_nr_option-26_db.bat Mon Mar 15 12:41:05 2010 +0200
@@ -0,0 +1,54 @@
+@rem
+@rem Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+@rem All rights reserved.
+@rem This component and the accompanying materials are made available
+@rem under the terms of the License "Eclipse Public License v1.0"
+@rem which accompanies this distribution, and is available
+@rem at the URL "http://www.eclipse.org/legal/sfl-v10.html".
+@rem
+@rem Initial Contributors:
+@rem Nokia Corporation - initial contribution.
+@rem
+@rem Contributors:
+@rem
+@rem Description:
+@rem
+@ECHO OFF
+REM int_nr_option_26
+REM int_nr_option_26 - PU over SA + SP. This is a positive testcase. Expected result : SIS file is Installed.
+
+IF NOT EXIST .\backup\cdrive mkdir .\backup\cdrive > NUL
+IF NOT EXIST .\backup\romdrive mkdir .\backup\romdrive > NUL
+if not exist .\cdrive mkdir .\cdrive > NUL
+if not exist .\cdrive\Documents mkdir .\cdrive\Documents > NUL
+if not exist .\romdrive mkdir .\romdrive > NUL
+if not exist .\romdrive\system\ mkdir .\romdrive\system\ > NUL
+if not exist .\romdrive\system\install\ mkdir .\romdrive\system\install\ > NUL
+REM Remove installation files from any previous tests
+if exist .\cdrive\Documents\InstTest\Equivalent*.txt del .\cdrive\Documents\InstTest\Equivalent*.txt > NUL
+
+xcopy /E /Y backup\cdrive cdrive > NUL
+xcopy /E /Y backup\romdrive romdrive > NUL
+
+REM Remove installation files from any previous tests
+if exist \epoc32\winscw\c\Documents\abc*.txt del \epoc32\winscw\c\Documents\abc*.txt > NUL
+if exist \epoc32\winscw\c\sys\install\sisregistry\80000086\*.reg del \epoc32\winscw\c\sys\install\sisregistry\80000086\*.reg > NUL
+if exist \epoc32\winscw\c\sys\install\sisregistry\80000086\*.ctl del \epoc32\winscw\c\sys\install\sisregistry\80000086\*.ctl > NUL
+
+call interpretsis -z .\romdrive -c .\cdrive -s \epoc32\winscw\c\tswi\tsis\data\int_nr_option_01.sis -w info -l /epoc32/winscw/c/interpretsis_test_harness_db.txt > NUL
+call interpretsis -z .\romdrive -c .\cdrive -s \epoc32\winscw\c\tswi\tsis\data\sp_int_nr_option_01.sis -w info -l /epoc32/winscw/c/interpretsis_test_harness_db.txt > NUL
+call interpretsis -z .\romdrive -c .\cdrive -s \epoc32\winscw\c\tswi\tsis\data\pu_int_nr_option_01.sis -w info -l /epoc32/winscw/c/interpretsis_test_harness_db.txt > NUL
+
+if not %errorlevel%==0 GOTO LAST
+if not exist \epoc32\winscw\c\Documents mkdir \epoc32\winscw\c\Documents
+call xcopy .\cdrive\Documents \epoc32\winscw\c\Documents /S /Y > NUL
+call xcopy .\cdrive\sys\install\sisregistry \epoc32\winscw\c\sys\install\sisregistry /S /Y > NUL
+if exist \epoc32\winscw\c\sys\install\scr\scr.db del \epoc32\winscw\c\sys\install\scr\scr.db > NUL
+copy .\romdrive\sys\install\scr\provisioned\scr.db \epoc32\winscw\c\sys\install\scr\scr.db /Y > NUL
+if exist \epoc32\winscw\c\sys\install\sisregistry\backup.lst del \epoc32\winscw\c\sys\install\sisregistry\backup.lst > NUL
+
+ECHO ***ERRORCODE*** %errorlevel% PASS>>/epoc32/winscw/c/interpretsis_test_harness_db.txt
+GOTO END
+:LAST
+ECHO ***ERRORCODE*** %errorlevel% FAIL>>/epoc32/winscw/c/interpretsis_test_harness_db.txt
+:END
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/secureswitools/swisistools/test/tinterpretsisinteg/int_nr_option-27.bat Mon Mar 15 12:41:05 2010 +0200
@@ -0,0 +1,50 @@
+@rem
+@rem Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+@rem All rights reserved.
+@rem This component and the accompanying materials are made available
+@rem under the terms of the License "Eclipse Public License v1.0"
+@rem which accompanies this distribution, and is available
+@rem at the URL "http://www.eclipse.org/legal/sfl-v10.html".
+@rem
+@rem Initial Contributors:
+@rem Nokia Corporation - initial contribution.
+@rem
+@rem Contributors:
+@rem
+@rem Description:
+@rem
+@ECHO OFF
+REM int_nr_option_27
+REM int_nr_option_27 - PU over SA(NR) + SP. This is a positive testcase. Expected result : SIS file is not Installed.
+
+IF NOT EXIST .\backup\cdrive mkdir .\backup\cdrive > NUL
+IF NOT EXIST .\backup\romdrive mkdir .\backup\romdrive > NUL
+if not exist .\cdrive mkdir .\cdrive > NUL
+if not exist .\cdrive\Documents mkdir .\cdrive\Documents > NUL
+if not exist .\romdrive mkdir .\romdrive > NUL
+if not exist .\romdrive\system\ mkdir .\romdrive\system\ > NUL
+if not exist .\romdrive\system\install\ mkdir .\romdrive\system\install\ > NUL
+
+xcopy /E /Y backup\cdrive cdrive > NUL
+xcopy /E /Y backup\romdrive romdrive > NUL
+
+REM Remove installation files from any previous tests
+if exist \epoc32\winscw\c\Documents\abc*.txt del \epoc32\winscw\c\Documents\abc*.txt > NUL
+if exist \epoc32\winscw\c\sys\install\sisregistry\80000086\*.reg del \epoc32\winscw\c\sys\install\sisregistry\80000086\*.reg > NUL
+if exist \epoc32\winscw\c\sys\install\sisregistry\80000086\*.ctl del \epoc32\winscw\c\sys\install\sisregistry\80000086\*.ctl > NUL
+
+call interpretsis -z .\romdrive -c .\cdrive -s \epoc32\winscw\c\tswi\tsis\data\int_nr_option_01.sis +nonremovablepkg -w info -l /epoc32/winscw/c/interpretsis_test_harness.txt > NUL
+call interpretsis -z .\romdrive -c .\cdrive -s \epoc32\winscw\c\tswi\tsis\data\sp_int_nr_option_01.sis -w info -l /epoc32/winscw/c/interpretsis_test_harness.txt > NUL
+call interpretsis -z .\romdrive -c .\cdrive -s \epoc32\winscw\c\tswi\tsis\data\pu_int_nr_option_01.sis -w info -l /epoc32/winscw/c/interpretsis_test_harness.txt > NUL
+
+if not %errorlevel%==0 GOTO LAST
+if not exist \epoc32\winscw\c\Documents mkdir \epoc32\winscw\c\Documents
+call xcopy .\cdrive\sys\install\sisregistry \epoc32\winscw\c\sys\install\sisregistry /S /Y > NUL
+call xcopy .\cdrive\Documents \epoc32\winscw\c\Documents /S /Y > NUL
+if exist \epoc32\winscw\c\sys\install\sisregistry\backup.lst del \epoc32\winscw\c\sys\install\sisregistry\backup.lst > NUL
+
+ECHO ***ERRORCODE*** %errorlevel% PASS>>/epoc32/winscw/c/interpretsis_test_harness.txt
+GOTO END
+:LAST
+ECHO ***ERRORCODE*** %errorlevel% FAIL>>/epoc32/winscw/c/interpretsis_test_harness.txt
+:END
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/secureswitools/swisistools/test/tinterpretsisinteg/int_nr_option-27_db.bat Mon Mar 15 12:41:05 2010 +0200
@@ -0,0 +1,54 @@
+@rem
+@rem Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+@rem All rights reserved.
+@rem This component and the accompanying materials are made available
+@rem under the terms of the License "Eclipse Public License v1.0"
+@rem which accompanies this distribution, and is available
+@rem at the URL "http://www.eclipse.org/legal/sfl-v10.html".
+@rem
+@rem Initial Contributors:
+@rem Nokia Corporation - initial contribution.
+@rem
+@rem Contributors:
+@rem
+@rem Description:
+@rem
+@ECHO OFF
+REM int_nr_option_27
+REM int_nr_option_27 - PU over SA(NR) + SP. This is a positive testcase. Expected result : SIS file is not Installed.
+
+IF NOT EXIST .\backup\cdrive mkdir .\backup\cdrive > NUL
+IF NOT EXIST .\backup\romdrive mkdir .\backup\romdrive > NUL
+if not exist .\cdrive mkdir .\cdrive > NUL
+if not exist .\cdrive\Documents mkdir .\cdrive\Documents > NUL
+if not exist .\romdrive mkdir .\romdrive > NUL
+if not exist .\romdrive\system\ mkdir .\romdrive\system\ > NUL
+if not exist .\romdrive\system\install\ mkdir .\romdrive\system\install\ > NUL
+REM Remove installation files from any previous tests
+if exist .\cdrive\Documents\InstTest\Equivalent*.txt del .\cdrive\Documents\InstTest\Equivalent*.txt > NUL
+
+xcopy /E /Y backup\cdrive cdrive > NUL
+xcopy /E /Y backup\romdrive romdrive > NUL
+
+REM Remove installation files from any previous tests
+if exist \epoc32\winscw\c\Documents\abc*.txt del \epoc32\winscw\c\Documents\abc*.txt > NUL
+if exist \epoc32\winscw\c\sys\install\sisregistry\80000086\*.reg del \epoc32\winscw\c\sys\install\sisregistry\80000086\*.reg > NUL
+if exist \epoc32\winscw\c\sys\install\sisregistry\80000086\*.ctl del \epoc32\winscw\c\sys\install\sisregistry\80000086\*.ctl > NUL
+
+call interpretsis -z .\romdrive -c .\cdrive -s \epoc32\winscw\c\tswi\tsis\data\int_nr_option_01.sis +nonremovablepkg -w info -l /epoc32/winscw/c/interpretsis_test_harness_db.txt > NUL
+call interpretsis -z .\romdrive -c .\cdrive -s \epoc32\winscw\c\tswi\tsis\data\sp_int_nr_option_01.sis -w info -l /epoc32/winscw/c/interpretsis_test_harness_db.txt > NUL
+call interpretsis -z .\romdrive -c .\cdrive -s \epoc32\winscw\c\tswi\tsis\data\pu_int_nr_option_01.sis -w info -l /epoc32/winscw/c/interpretsis_test_harness_db.txt > NUL
+
+if not %errorlevel%==0 GOTO LAST
+if not exist \epoc32\winscw\c\Documents mkdir \epoc32\winscw\c\Documents
+call xcopy .\cdrive\Documents \epoc32\winscw\c\Documents /S /Y > NUL
+call xcopy .\cdrive\sys\install\sisregistry \epoc32\winscw\c\sys\install\sisregistry /S /Y > NUL
+if exist \epoc32\winscw\c\sys\install\scr\scr.db del \epoc32\winscw\c\sys\install\scr\scr.db > NUL
+copy .\romdrive\sys\install\scr\provisioned\scr.db \epoc32\winscw\c\sys\install\scr\scr.db /Y > NUL
+if exist \epoc32\winscw\c\sys\install\sisregistry\backup.lst del \epoc32\winscw\c\sys\install\sisregistry\backup.lst > NUL
+
+ECHO ***ERRORCODE*** %errorlevel% PASS>>/epoc32/winscw/c/interpretsis_test_harness_db.txt
+GOTO END
+:LAST
+ECHO ***ERRORCODE*** %errorlevel% FAIL>>/epoc32/winscw/c/interpretsis_test_harness_db.txt
+:END
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/secureswitools/swisistools/test/tinterpretsisinteg/int_nr_option-28.bat Mon Mar 15 12:41:05 2010 +0200
@@ -0,0 +1,50 @@
+@rem
+@rem Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+@rem All rights reserved.
+@rem This component and the accompanying materials are made available
+@rem under the terms of the License "Eclipse Public License v1.0"
+@rem which accompanies this distribution, and is available
+@rem at the URL "http://www.eclipse.org/legal/sfl-v10.html".
+@rem
+@rem Initial Contributors:
+@rem Nokia Corporation - initial contribution.
+@rem
+@rem Contributors:
+@rem
+@rem Description:
+@rem
+@ECHO OFF
+REM int_nr_option_28
+REM int_nr_option_28 - PU over SA(NR) + SP(NR). This is a positive testcase. Expected result : SIS file is not Installed.
+
+IF NOT EXIST .\backup\cdrive mkdir .\backup\cdrive > NUL
+IF NOT EXIST .\backup\romdrive mkdir .\backup\romdrive > NUL
+if not exist .\cdrive mkdir .\cdrive > NUL
+if not exist .\cdrive\Documents mkdir .\cdrive\Documents > NUL
+if not exist .\romdrive mkdir .\romdrive > NUL
+if not exist .\romdrive\system\ mkdir .\romdrive\system\ > NUL
+if not exist .\romdrive\system\install\ mkdir .\romdrive\system\install\ > NUL
+
+xcopy /E /Y backup\cdrive cdrive > NUL
+xcopy /E /Y backup\romdrive romdrive > NUL
+
+REM Remove installation files from any previous tests
+if exist \epoc32\winscw\c\Documents\abc*.txt del \epoc32\winscw\c\Documents\abc*.txt > NUL
+if exist \epoc32\winscw\c\sys\install\sisregistry\80000086\*.reg del \epoc32\winscw\c\sys\install\sisregistry\80000086\*.reg > NUL
+if exist \epoc32\winscw\c\sys\install\sisregistry\80000086\*.ctl del \epoc32\winscw\c\sys\install\sisregistry\80000086\*.ctl > NUL
+
+call interpretsis -z .\romdrive -c .\cdrive -s \epoc32\winscw\c\tswi\tsis\data\int_nr_option_01.sis +nonremovablepkg -w info -l /epoc32/winscw/c/interpretsis_test_harness.txt > NUL
+call interpretsis -z .\romdrive -c .\cdrive -s \epoc32\winscw\c\tswi\tsis\data\sp_int_nr_option_01.sis +nonremovablepkg -w info -l /epoc32/winscw/c/interpretsis_test_harness.txt > NUL
+call interpretsis -z .\romdrive -c .\cdrive -s \epoc32\winscw\c\tswi\tsis\data\pu_int_nr_option_01.sis -w info -l /epoc32/winscw/c/interpretsis_test_harness.txt > NUL
+
+if not %errorlevel%==0 GOTO LAST
+if not exist \epoc32\winscw\c\Documents mkdir \epoc32\winscw\c\Documents
+call xcopy .\cdrive\sys\install\sisregistry \epoc32\winscw\c\sys\install\sisregistry /S /Y > NUL
+call xcopy .\cdrive\Documents \epoc32\winscw\c\Documents /S /Y > NUL
+if exist \epoc32\winscw\c\sys\install\sisregistry\backup.lst del \epoc32\winscw\c\sys\install\sisregistry\backup.lst > NUL
+
+ECHO ***ERRORCODE*** %errorlevel% PASS>>/epoc32/winscw/c/interpretsis_test_harness.txt
+GOTO END
+:LAST
+ECHO ***ERRORCODE*** %errorlevel% FAIL>>/epoc32/winscw/c/interpretsis_test_harness.txt
+:END
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/secureswitools/swisistools/test/tinterpretsisinteg/int_nr_option-28_db.bat Mon Mar 15 12:41:05 2010 +0200
@@ -0,0 +1,54 @@
+@rem
+@rem Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+@rem All rights reserved.
+@rem This component and the accompanying materials are made available
+@rem under the terms of the License "Eclipse Public License v1.0"
+@rem which accompanies this distribution, and is available
+@rem at the URL "http://www.eclipse.org/legal/sfl-v10.html".
+@rem
+@rem Initial Contributors:
+@rem Nokia Corporation - initial contribution.
+@rem
+@rem Contributors:
+@rem
+@rem Description:
+@rem
+@ECHO OFF
+REM int_nr_option_28
+REM int_nr_option_28 - PU over SA(NR) + SP(NR). This is a positive testcase. Expected result : SIS file is not Installed.
+
+IF NOT EXIST .\backup\cdrive mkdir .\backup\cdrive > NUL
+IF NOT EXIST .\backup\romdrive mkdir .\backup\romdrive > NUL
+if not exist .\cdrive mkdir .\cdrive > NUL
+if not exist .\cdrive\Documents mkdir .\cdrive\Documents > NUL
+if not exist .\romdrive mkdir .\romdrive > NUL
+if not exist .\romdrive\system\ mkdir .\romdrive\system\ > NUL
+if not exist .\romdrive\system\install\ mkdir .\romdrive\system\install\ > NUL
+REM Remove installation files from any previous tests
+if exist .\cdrive\Documents\InstTest\Equivalent*.txt del .\cdrive\Documents\InstTest\Equivalent*.txt > NUL
+
+xcopy /E /Y backup\cdrive cdrive > NUL
+xcopy /E /Y backup\romdrive romdrive > NUL
+
+REM Remove installation files from any previous tests
+if exist \epoc32\winscw\c\Documents\abc*.txt del \epoc32\winscw\c\Documents\abc*.txt > NUL
+if exist \epoc32\winscw\c\sys\install\sisregistry\80000086\*.reg del \epoc32\winscw\c\sys\install\sisregistry\80000086\*.reg > NUL
+if exist \epoc32\winscw\c\sys\install\sisregistry\80000086\*.ctl del \epoc32\winscw\c\sys\install\sisregistry\80000086\*.ctl > NUL
+
+call interpretsis -z .\romdrive -c .\cdrive -s \epoc32\winscw\c\tswi\tsis\data\int_nr_option_01.sis +nonremovablepkg -w info -l /epoc32/winscw/c/interpretsis_test_harness_db.txt > NUL
+call interpretsis -z .\romdrive -c .\cdrive -s \epoc32\winscw\c\tswi\tsis\data\sp_int_nr_option_01.sis +nonremovablepkg -w info -l /epoc32/winscw/c/interpretsis_test_harness_db.txt > NUL
+call interpretsis -z .\romdrive -c .\cdrive -s \epoc32\winscw\c\tswi\tsis\data\pu_int_nr_option_01.sis -w info -l /epoc32/winscw/c/interpretsis_test_harness_db.txt > NUL
+
+if not %errorlevel%==0 GOTO LAST
+if not exist \epoc32\winscw\c\Documents mkdir \epoc32\winscw\c\Documents
+call xcopy .\cdrive\Documents \epoc32\winscw\c\Documents /S /Y > NUL
+call xcopy .\cdrive\sys\install\sisregistry \epoc32\winscw\c\sys\install\sisregistry /S /Y > NUL
+if exist \epoc32\winscw\c\sys\install\scr\scr.db del \epoc32\winscw\c\sys\install\scr\scr.db > NUL
+copy .\romdrive\sys\install\scr\provisioned\scr.db \epoc32\winscw\c\sys\install\scr\scr.db /Y > NUL
+if exist \epoc32\winscw\c\sys\install\sisregistry\backup.lst del \epoc32\winscw\c\sys\install\sisregistry\backup.lst > NUL
+
+ECHO ***ERRORCODE*** %errorlevel% PASS>>/epoc32/winscw/c/interpretsis_test_harness_db.txt
+GOTO END
+:LAST
+ECHO ***ERRORCODE*** %errorlevel% FAIL>>/epoc32/winscw/c/interpretsis_test_harness_db.txt
+:END
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/secureswitools/swisistools/test/tinterpretsisinteg/int_nr_option-29.bat Mon Mar 15 12:41:05 2010 +0200
@@ -0,0 +1,50 @@
+@rem
+@rem Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+@rem All rights reserved.
+@rem This component and the accompanying materials are made available
+@rem under the terms of the License "Eclipse Public License v1.0"
+@rem which accompanies this distribution, and is available
+@rem at the URL "http://www.eclipse.org/legal/sfl-v10.html".
+@rem
+@rem Initial Contributors:
+@rem Nokia Corporation - initial contribution.
+@rem
+@rem Contributors:
+@rem
+@rem Description:
+@rem
+@ECHO OFF
+REM int_nr_option_29
+REM int_nr_option_29 - PU(NR) over SA + SP. This is a positive testcase. SIS file is Installed.
+
+IF NOT EXIST .\backup\cdrive mkdir .\backup\cdrive > NUL
+IF NOT EXIST .\backup\romdrive mkdir .\backup\romdrive > NUL
+if not exist .\cdrive mkdir .\cdrive > NUL
+if not exist .\cdrive\Documents mkdir .\cdrive\Documents > NUL
+if not exist .\romdrive mkdir .\romdrive > NUL
+if not exist .\romdrive\system\ mkdir .\romdrive\system\ > NUL
+if not exist .\romdrive\system\install\ mkdir .\romdrive\system\install\ > NUL
+
+xcopy /E /Y backup\cdrive cdrive > NUL
+xcopy /E /Y backup\romdrive romdrive > NUL
+
+REM Remove installation files from any previous tests
+if exist \epoc32\winscw\c\Documents\abc*.txt del \epoc32\winscw\c\Documents\abc*.txt > NUL
+if exist \epoc32\winscw\c\sys\install\sisregistry\80000086\*.reg del \epoc32\winscw\c\sys\install\sisregistry\80000086\*.reg > NUL
+if exist \epoc32\winscw\c\sys\install\sisregistry\80000086\*.ctl del \epoc32\winscw\c\sys\install\sisregistry\80000086\*.ctl > NUL
+
+call interpretsis -z .\romdrive -c .\cdrive -s \epoc32\winscw\c\tswi\tsis\data\int_nr_option_01.sis -w info -l /epoc32/winscw/c/interpretsis_test_harness.txt > NUL
+call interpretsis -z .\romdrive -c .\cdrive -s \epoc32\winscw\c\tswi\tsis\data\sp_int_nr_option_01.sis -w info -l /epoc32/winscw/c/interpretsis_test_harness.txt > NUL
+call interpretsis -z .\romdrive -c .\cdrive -s \epoc32\winscw\c\tswi\tsis\data\pu_int_nr_option_01.sis +nonremovablepkg -w info -l /epoc32/winscw/c/interpretsis_test_harness.txt > NUL
+
+if not %errorlevel%==0 GOTO LAST
+if not exist \epoc32\winscw\c\Documents mkdir \epoc32\winscw\c\Documents
+call xcopy .\cdrive\sys\install\sisregistry \epoc32\winscw\c\sys\install\sisregistry /S /Y > NUL
+call xcopy .\cdrive\Documents \epoc32\winscw\c\Documents /S /Y > NUL
+if exist \epoc32\winscw\c\sys\install\sisregistry\backup.lst del \epoc32\winscw\c\sys\install\sisregistry\backup.lst > NUL
+
+ECHO ***ERRORCODE*** %errorlevel% PASS>>/epoc32/winscw/c/interpretsis_test_harness.txt
+GOTO END
+:LAST
+ECHO ***ERRORCODE*** %errorlevel% FAIL>>/epoc32/winscw/c/interpretsis_test_harness.txt
+:END
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/secureswitools/swisistools/test/tinterpretsisinteg/int_nr_option-29_db.bat Mon Mar 15 12:41:05 2010 +0200
@@ -0,0 +1,54 @@
+@rem
+@rem Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+@rem All rights reserved.
+@rem This component and the accompanying materials are made available
+@rem under the terms of the License "Eclipse Public License v1.0"
+@rem which accompanies this distribution, and is available
+@rem at the URL "http://www.eclipse.org/legal/sfl-v10.html".
+@rem
+@rem Initial Contributors:
+@rem Nokia Corporation - initial contribution.
+@rem
+@rem Contributors:
+@rem
+@rem Description:
+@rem
+@ECHO OFF
+REM int_nr_option_29
+REM int_nr_option_29 - PU(NR) over SA + SP. This is a positive testcase. SIS file is Installed.
+
+IF NOT EXIST .\backup\cdrive mkdir .\backup\cdrive > NUL
+IF NOT EXIST .\backup\romdrive mkdir .\backup\romdrive > NUL
+if not exist .\cdrive mkdir .\cdrive > NUL
+if not exist .\cdrive\Documents mkdir .\cdrive\Documents > NUL
+if not exist .\romdrive mkdir .\romdrive > NUL
+if not exist .\romdrive\system\ mkdir .\romdrive\system\ > NUL
+if not exist .\romdrive\system\install\ mkdir .\romdrive\system\install\ > NUL
+REM Remove installation files from any previous tests
+if exist .\cdrive\Documents\InstTest\Equivalent*.txt del .\cdrive\Documents\InstTest\Equivalent*.txt > NUL
+
+xcopy /E /Y backup\cdrive cdrive > NUL
+xcopy /E /Y backup\romdrive romdrive > NUL
+
+REM Remove installation files from any previous tests
+if exist \epoc32\winscw\c\Documents\abc*.txt del \epoc32\winscw\c\Documents\abc*.txt > NUL
+if exist \epoc32\winscw\c\sys\install\sisregistry\80000086\*.reg del \epoc32\winscw\c\sys\install\sisregistry\80000086\*.reg > NUL
+if exist \epoc32\winscw\c\sys\install\sisregistry\80000086\*.ctl del \epoc32\winscw\c\sys\install\sisregistry\80000086\*.ctl > NUL
+
+call interpretsis -z .\romdrive -c .\cdrive -s \epoc32\winscw\c\tswi\tsis\data\int_nr_option_01.sis -w info -l /epoc32/winscw/c/interpretsis_test_harness_db.txt > NUL
+call interpretsis -z .\romdrive -c .\cdrive -s \epoc32\winscw\c\tswi\tsis\data\sp_int_nr_option_01.sis -w info -l /epoc32/winscw/c/interpretsis_test_harness_db.txt > NUL
+call interpretsis -z .\romdrive -c .\cdrive -s \epoc32\winscw\c\tswi\tsis\data\pu_int_nr_option_01.sis +nonremovablepkg -w info -l /epoc32/winscw/c/interpretsis_test_harness_db.txt > NUL
+
+if not %errorlevel%==0 GOTO LAST
+if not exist \epoc32\winscw\c\Documents mkdir \epoc32\winscw\c\Documents
+call xcopy .\cdrive\Documents \epoc32\winscw\c\Documents /S /Y > NUL
+call xcopy .\cdrive\sys\install\sisregistry \epoc32\winscw\c\sys\install\sisregistry /S /Y > NUL
+if exist \epoc32\winscw\c\sys\install\scr\scr.db del \epoc32\winscw\c\sys\install\scr\scr.db > NUL
+copy .\romdrive\sys\install\scr\provisioned\scr.db \epoc32\winscw\c\sys\install\scr\scr.db /Y > NUL
+if exist \epoc32\winscw\c\sys\install\sisregistry\backup.lst del \epoc32\winscw\c\sys\install\sisregistry\backup.lst > NUL
+
+ECHO ***ERRORCODE*** %errorlevel% PASS>>/epoc32/winscw/c/interpretsis_test_harness_db.txt
+GOTO END
+:LAST
+ECHO ***ERRORCODE*** %errorlevel% FAIL>>/epoc32/winscw/c/interpretsis_test_harness_db.txt
+:END
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/secureswitools/swisistools/test/tinterpretsisinteg/int_nr_option-30.bat Mon Mar 15 12:41:05 2010 +0200
@@ -0,0 +1,50 @@
+@rem
+@rem Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+@rem All rights reserved.
+@rem This component and the accompanying materials are made available
+@rem under the terms of the License "Eclipse Public License v1.0"
+@rem which accompanies this distribution, and is available
+@rem at the URL "http://www.eclipse.org/legal/sfl-v10.html".
+@rem
+@rem Initial Contributors:
+@rem Nokia Corporation - initial contribution.
+@rem
+@rem Contributors:
+@rem
+@rem Description:
+@rem
+@ECHO OFF
+REM int_nr_option_30
+REM int_nr_option_30 - PU(NR) over SA(NR) + SP. This is a positive testcase. Expected result : SIS file is Installed.
+
+IF NOT EXIST .\backup\cdrive mkdir .\backup\cdrive > NUL
+IF NOT EXIST .\backup\romdrive mkdir .\backup\romdrive > NUL
+if not exist .\cdrive mkdir .\cdrive > NUL
+if not exist .\cdrive\Documents mkdir .\cdrive\Documents > NUL
+if not exist .\romdrive mkdir .\romdrive > NUL
+if not exist .\romdrive\system\ mkdir .\romdrive\system\ > NUL
+if not exist .\romdrive\system\install\ mkdir .\romdrive\system\install\ > NUL
+
+xcopy /E /Y backup\cdrive cdrive > NUL
+xcopy /E /Y backup\romdrive romdrive > NUL
+
+REM Remove installation files from any previous tests
+if exist \epoc32\winscw\c\Documents\abc*.txt del \epoc32\winscw\c\Documents\abc*.txt > NUL
+if exist \epoc32\winscw\c\sys\install\sisregistry\80000086\*.reg del \epoc32\winscw\c\sys\install\sisregistry\80000086\*.reg > NUL
+if exist \epoc32\winscw\c\sys\install\sisregistry\80000086\*.ctl del \epoc32\winscw\c\sys\install\sisregistry\80000086\*.ctl > NUL
+
+call interpretsis -z .\romdrive -c .\cdrive -s \epoc32\winscw\c\tswi\tsis\data\int_nr_option_01.sis +nonremovablepkg -w info -l /epoc32/winscw/c/interpretsis_test_harness.txt > NUL
+call interpretsis -z .\romdrive -c .\cdrive -s \epoc32\winscw\c\tswi\tsis\data\sp_int_nr_option_01.sis -w info -l /epoc32/winscw/c/interpretsis_test_harness.txt > NUL
+call interpretsis -z .\romdrive -c .\cdrive -s \epoc32\winscw\c\tswi\tsis\data\pu_int_nr_option_01.sis +nonremovablepkg -w info -l /epoc32/winscw/c/interpretsis_test_harness.txt > NUL
+
+if not %errorlevel%==0 GOTO LAST
+if not exist \epoc32\winscw\c\Documents mkdir \epoc32\winscw\c\Documents
+call xcopy .\cdrive\sys\install\sisregistry \epoc32\winscw\c\sys\install\sisregistry /S /Y > NUL
+call xcopy .\cdrive\Documents \epoc32\winscw\c\Documents /S /Y > NUL
+if exist \epoc32\winscw\c\sys\install\sisregistry\backup.lst del \epoc32\winscw\c\sys\install\sisregistry\backup.lst > NUL
+
+ECHO ***ERRORCODE*** %errorlevel% PASS>>/epoc32/winscw/c/interpretsis_test_harness.txt
+GOTO END
+:LAST
+ECHO ***ERRORCODE*** %errorlevel% FAIL>>/epoc32/winscw/c/interpretsis_test_harness.txt
+:END
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/secureswitools/swisistools/test/tinterpretsisinteg/int_nr_option-30_db.bat Mon Mar 15 12:41:05 2010 +0200
@@ -0,0 +1,54 @@
+@rem
+@rem Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+@rem All rights reserved.
+@rem This component and the accompanying materials are made available
+@rem under the terms of the License "Eclipse Public License v1.0"
+@rem which accompanies this distribution, and is available
+@rem at the URL "http://www.eclipse.org/legal/sfl-v10.html".
+@rem
+@rem Initial Contributors:
+@rem Nokia Corporation - initial contribution.
+@rem
+@rem Contributors:
+@rem
+@rem Description:
+@rem
+@ECHO OFF
+REM int_nr_option_30
+REM int_nr_option_30 - PU(NR) over SA(NR) + SP. This is a positive testcase. Expected result : SIS file is Installed.
+
+IF NOT EXIST .\backup\cdrive mkdir .\backup\cdrive > NUL
+IF NOT EXIST .\backup\romdrive mkdir .\backup\romdrive > NUL
+if not exist .\cdrive mkdir .\cdrive > NUL
+if not exist .\cdrive\Documents mkdir .\cdrive\Documents > NUL
+if not exist .\romdrive mkdir .\romdrive > NUL
+if not exist .\romdrive\system\ mkdir .\romdrive\system\ > NUL
+if not exist .\romdrive\system\install\ mkdir .\romdrive\system\install\ > NUL
+REM Remove installation files from any previous tests
+if exist .\cdrive\Documents\InstTest\Equivalent*.txt del .\cdrive\Documents\InstTest\Equivalent*.txt > NUL
+
+xcopy /E /Y backup\cdrive cdrive > NUL
+xcopy /E /Y backup\romdrive romdrive > NUL
+
+REM Remove installation files from any previous tests
+if exist \epoc32\winscw\c\Documents\abc*.txt del \epoc32\winscw\c\Documents\abc*.txt > NUL
+if exist \epoc32\winscw\c\sys\install\sisregistry\80000086\*.reg del \epoc32\winscw\c\sys\install\sisregistry\80000086\*.reg > NUL
+if exist \epoc32\winscw\c\sys\install\sisregistry\80000086\*.ctl del \epoc32\winscw\c\sys\install\sisregistry\80000086\*.ctl > NUL
+
+call interpretsis -z .\romdrive -c .\cdrive -s \epoc32\winscw\c\tswi\tsis\data\int_nr_option_01.sis +nonremovablepkg -w info -l /epoc32/winscw/c/interpretsis_test_harness_db.txt > NUL
+call interpretsis -z .\romdrive -c .\cdrive -s \epoc32\winscw\c\tswi\tsis\data\sp_int_nr_option_01.sis -w info -l /epoc32/winscw/c/interpretsis_test_harness_db.txt > NUL
+call interpretsis -z .\romdrive -c .\cdrive -s \epoc32\winscw\c\tswi\tsis\data\pu_int_nr_option_01.sis +nonremovablepkg -w info -l /epoc32/winscw/c/interpretsis_test_harness_db.txt > NUL
+
+if not %errorlevel%==0 GOTO LAST
+if not exist \epoc32\winscw\c\Documents mkdir \epoc32\winscw\c\Documents
+call xcopy .\cdrive\Documents \epoc32\winscw\c\Documents /S /Y > NUL
+call xcopy .\cdrive\sys\install\sisregistry \epoc32\winscw\c\sys\install\sisregistry /S /Y > NUL
+if exist \epoc32\winscw\c\sys\install\scr\scr.db del \epoc32\winscw\c\sys\install\scr\scr.db > NUL
+copy .\romdrive\sys\install\scr\provisioned\scr.db \epoc32\winscw\c\sys\install\scr\scr.db /Y > NUL
+if exist \epoc32\winscw\c\sys\install\sisregistry\backup.lst del \epoc32\winscw\c\sys\install\sisregistry\backup.lst > NUL
+
+ECHO ***ERRORCODE*** %errorlevel% PASS>>/epoc32/winscw/c/interpretsis_test_harness_db.txt
+GOTO END
+:LAST
+ECHO ***ERRORCODE*** %errorlevel% FAIL>>/epoc32/winscw/c/interpretsis_test_harness_db.txt
+:END
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/secureswitools/swisistools/test/tinterpretsisinteg/int_nr_option-31.bat Mon Mar 15 12:41:05 2010 +0200
@@ -0,0 +1,50 @@
+@rem
+@rem Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+@rem All rights reserved.
+@rem This component and the accompanying materials are made available
+@rem under the terms of the License "Eclipse Public License v1.0"
+@rem which accompanies this distribution, and is available
+@rem at the URL "http://www.eclipse.org/legal/sfl-v10.html".
+@rem
+@rem Initial Contributors:
+@rem Nokia Corporation - initial contribution.
+@rem
+@rem Contributors:
+@rem
+@rem Description:
+@rem
+@ECHO OFF
+REM int_nr_option_31
+REM int_nr_option_31 - PU(NR) over SA(NR) + SP(NR). This is a positive testcase. Expected result : SIS file is Installed.
+
+IF NOT EXIST .\backup\cdrive mkdir .\backup\cdrive > NUL
+IF NOT EXIST .\backup\romdrive mkdir .\backup\romdrive > NUL
+if not exist .\cdrive mkdir .\cdrive > NUL
+if not exist .\cdrive\Documents mkdir .\cdrive\Documents > NUL
+if not exist .\romdrive mkdir .\romdrive > NUL
+if not exist .\romdrive\system\ mkdir .\romdrive\system\ > NUL
+if not exist .\romdrive\system\install\ mkdir .\romdrive\system\install\ > NUL
+
+xcopy /E /Y backup\cdrive cdrive > NUL
+xcopy /E /Y backup\romdrive romdrive > NUL
+
+REM Remove installation files from any previous tests
+if exist \epoc32\winscw\c\Documents\abc*.txt del \epoc32\winscw\c\Documents\abc*.txt > NUL
+if exist \epoc32\winscw\c\sys\install\sisregistry\80000086\*.reg del \epoc32\winscw\c\sys\install\sisregistry\80000086\*.reg > NUL
+if exist \epoc32\winscw\c\sys\install\sisregistry\80000086\*.ctl del \epoc32\winscw\c\sys\install\sisregistry\80000086\*.ctl > NUL
+
+call interpretsis -z .\romdrive -c .\cdrive -s \epoc32\winscw\c\tswi\tsis\data\int_nr_option_01.sis +nonremovablepkg -w info -l /epoc32/winscw/c/interpretsis_test_harness.txt > NUL
+call interpretsis -z .\romdrive -c .\cdrive -s \epoc32\winscw\c\tswi\tsis\data\sp_int_nr_option_01.sis +nonremovablepkg -w info -l /epoc32/winscw/c/interpretsis_test_harness.txt > NUL
+call interpretsis -z .\romdrive -c .\cdrive -s \epoc32\winscw\c\tswi\tsis\data\pu_int_nr_option_01.sis +nonremovablepkg -w info -l /epoc32/winscw/c/interpretsis_test_harness.txt > NUL
+
+if not %errorlevel%==0 GOTO LAST
+if not exist \epoc32\winscw\c\Documents mkdir \epoc32\winscw\c\Documents
+call xcopy .\cdrive\sys\install\sisregistry \epoc32\winscw\c\sys\install\sisregistry /S /Y > NUL
+call xcopy .\cdrive\Documents \epoc32\winscw\c\Documents /S /Y > NUL
+if exist \epoc32\winscw\c\sys\install\sisregistry\backup.lst del \epoc32\winscw\c\sys\install\sisregistry\backup.lst > NUL
+
+ECHO ***ERRORCODE*** %errorlevel% PASS>>/epoc32/winscw/c/interpretsis_test_harness.txt
+GOTO END
+:LAST
+ECHO ***ERRORCODE*** %errorlevel% FAIL>>/epoc32/winscw/c/interpretsis_test_harness.txt
+:END
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/secureswitools/swisistools/test/tinterpretsisinteg/int_nr_option-31_db.bat Mon Mar 15 12:41:05 2010 +0200
@@ -0,0 +1,54 @@
+@rem
+@rem Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+@rem All rights reserved.
+@rem This component and the accompanying materials are made available
+@rem under the terms of the License "Eclipse Public License v1.0"
+@rem which accompanies this distribution, and is available
+@rem at the URL "http://www.eclipse.org/legal/sfl-v10.html".
+@rem
+@rem Initial Contributors:
+@rem Nokia Corporation - initial contribution.
+@rem
+@rem Contributors:
+@rem
+@rem Description:
+@rem
+@ECHO OFF
+REM int_nr_option_31
+REM int_nr_option_31 - PU(NR) over SA(NR) + SP(NR). This is a positive testcase. Expected result : SIS file is Installed.
+
+IF NOT EXIST .\backup\cdrive mkdir .\backup\cdrive > NUL
+IF NOT EXIST .\backup\romdrive mkdir .\backup\romdrive > NUL
+if not exist .\cdrive mkdir .\cdrive > NUL
+if not exist .\cdrive\Documents mkdir .\cdrive\Documents > NUL
+if not exist .\romdrive mkdir .\romdrive > NUL
+if not exist .\romdrive\system\ mkdir .\romdrive\system\ > NUL
+if not exist .\romdrive\system\install\ mkdir .\romdrive\system\install\ > NUL
+REM Remove installation files from any previous tests
+if exist .\cdrive\Documents\InstTest\Equivalent*.txt del .\cdrive\Documents\InstTest\Equivalent*.txt > NUL
+
+xcopy /E /Y backup\cdrive cdrive > NUL
+xcopy /E /Y backup\romdrive romdrive > NUL
+
+REM Remove installation files from any previous tests
+if exist \epoc32\winscw\c\Documents\abc*.txt del \epoc32\winscw\c\Documents\abc*.txt > NUL
+if exist \epoc32\winscw\c\sys\install\sisregistry\80000086\*.reg del \epoc32\winscw\c\sys\install\sisregistry\80000086\*.reg > NUL
+if exist \epoc32\winscw\c\sys\install\sisregistry\80000086\*.ctl del \epoc32\winscw\c\sys\install\sisregistry\80000086\*.ctl > NUL
+
+call interpretsis -z .\romdrive -c .\cdrive -s \epoc32\winscw\c\tswi\tsis\data\int_nr_option_01.sis +nonremovablepkg -w info -l /epoc32/winscw/c/interpretsis_test_harness_db.txt > NUL
+call interpretsis -z .\romdrive -c .\cdrive -s \epoc32\winscw\c\tswi\tsis\data\sp_int_nr_option_01.sis +nonremovablepkg -w info -l /epoc32/winscw/c/interpretsis_test_harness_db.txt > NUL
+call interpretsis -z .\romdrive -c .\cdrive -s \epoc32\winscw\c\tswi\tsis\data\pu_int_nr_option_01.sis +nonremovablepkg -w info -l /epoc32/winscw/c/interpretsis_test_harness_db.txt > NUL
+
+if not %errorlevel%==0 GOTO LAST
+if not exist \epoc32\winscw\c\Documents mkdir \epoc32\winscw\c\Documents
+call xcopy .\cdrive\Documents \epoc32\winscw\c\Documents /S /Y > NUL
+call xcopy .\cdrive\sys\install\sisregistry \epoc32\winscw\c\sys\install\sisregistry /S /Y > NUL
+if exist \epoc32\winscw\c\sys\install\scr\scr.db del \epoc32\winscw\c\sys\install\scr\scr.db > NUL
+copy .\romdrive\sys\install\scr\provisioned\scr.db \epoc32\winscw\c\sys\install\scr\scr.db /Y > NUL
+if exist \epoc32\winscw\c\sys\install\sisregistry\backup.lst del \epoc32\winscw\c\sys\install\sisregistry\backup.lst > NUL
+
+ECHO ***ERRORCODE*** %errorlevel% PASS>>/epoc32/winscw/c/interpretsis_test_harness_db.txt
+GOTO END
+:LAST
+ECHO ***ERRORCODE*** %errorlevel% FAIL>>/epoc32/winscw/c/interpretsis_test_harness_db.txt
+:END
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/secureswitools/swisistools/test/tinterpretsisinteg/int_nr_option-32.bat Mon Mar 15 12:41:05 2010 +0200
@@ -0,0 +1,51 @@
+@rem
+@rem Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+@rem All rights reserved.
+@rem This component and the accompanying materials are made available
+@rem under the terms of the License "Eclipse Public License v1.0"
+@rem which accompanies this distribution, and is available
+@rem at the URL "http://www.eclipse.org/legal/sfl-v10.html".
+@rem
+@rem Initial Contributors:
+@rem Nokia Corporation - initial contribution.
+@rem
+@rem Contributors:
+@rem
+@rem Description:
+@rem
+@ECHO OFF
+REM int_nr_option_32
+REM int_nr_option_32 - SA over Rom Stub. This is a positive testcase. Expected result : SIS file is Installed.
+
+IF NOT EXIST .\backup\cdrive mkdir .\backup\cdrive > NUL
+IF NOT EXIST .\backup\romdrive mkdir .\backup\romdrive > NUL
+if not exist .\cdrive mkdir .\cdrive > NUL
+if not exist .\cdrive\Documents mkdir .\cdrive\Documents > NUL
+if not exist .\romdrive mkdir .\romdrive > NUL
+if not exist .\romdrive\system\ mkdir .\romdrive\system\ > NUL
+if not exist .\romdrive\system\install\ mkdir .\romdrive\system\install\ > NUL
+
+xcopy /E /Y backup\cdrive cdrive > NUL
+xcopy /E /Y backup\romdrive romdrive > NUL
+
+copy \epoc32\winscw\c\tswi\tinterpretsisinteg\data\int_nr_option_01_stub.sis .\romdrive\system\install\int_nr_option_01_stub.sis /Y > NUL
+
+REM Remove installation files from any previous tests
+if exist \epoc32\winscw\c\Documents\abc*.txt del \epoc32\winscw\c\Documents\abc*.txt > NUL
+if exist \epoc32\winscw\c\sys\install\sisregistry\80000086\*.reg del \epoc32\winscw\c\sys\install\sisregistry\80000086\*.reg > NUL
+if exist \epoc32\winscw\c\sys\install\sisregistry\80000086\*.ctl del \epoc32\winscw\c\sys\install\sisregistry\80000086\*.ctl > NUL
+
+call interpretsis -z .\romdrive -c .\cdrive -s \epoc32\winscw\c\tswi\tsis\data\int_nr_option_03.sis -w info -l /epoc32/winscw/c/interpretsis_test_harness.txt > NUL
+
+if not %errorlevel%==0 GOTO LAST
+if not exist \epoc32\winscw\c\Documents mkdir \epoc32\winscw\c\Documents
+call xcopy .\cdrive\sys\install\sisregistry \epoc32\winscw\c\sys\install\sisregistry /S /Y > NUL
+call xcopy .\cdrive\Documents \epoc32\winscw\c\Documents /S /Y > NUL
+if exist \epoc32\winscw\c\sys\install\sisregistry\backup.lst del \epoc32\winscw\c\sys\install\sisregistry\backup.lst > NUL
+if exist .\romdrive\system\install\int_nr_option_01_stub.sis del .\romdrive\system\install\int_nr_option_01_stub.sis > NUL
+
+ECHO ***ERRORCODE*** %errorlevel% PASS>>/epoc32/winscw/c/interpretsis_test_harness.txt
+GOTO END
+:LAST
+ECHO ***ERRORCODE*** %errorlevel% FAIL>>/epoc32/winscw/c/interpretsis_test_harness.txt
+:END
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/secureswitools/swisistools/test/tinterpretsisinteg/int_nr_option-32_db.bat Mon Mar 15 12:41:05 2010 +0200
@@ -0,0 +1,55 @@
+@rem
+@rem Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+@rem All rights reserved.
+@rem This component and the accompanying materials are made available
+@rem under the terms of the License "Eclipse Public License v1.0"
+@rem which accompanies this distribution, and is available
+@rem at the URL "http://www.eclipse.org/legal/sfl-v10.html".
+@rem
+@rem Initial Contributors:
+@rem Nokia Corporation - initial contribution.
+@rem
+@rem Contributors:
+@rem
+@rem Description:
+@rem
+@ECHO OFF
+REM int_nr_option_32
+REM int_nr_option_32 - SA over Rom Stub. This is a positive testcase. Expected result : SIS file is Installed.
+
+IF NOT EXIST .\backup\cdrive mkdir .\backup\cdrive > NUL
+IF NOT EXIST .\backup\romdrive mkdir .\backup\romdrive > NUL
+if not exist .\cdrive mkdir .\cdrive > NUL
+if not exist .\cdrive\Documents mkdir .\cdrive\Documents > NUL
+if not exist .\romdrive mkdir .\romdrive > NUL
+if not exist .\romdrive\system\ mkdir .\romdrive\system\ > NUL
+if not exist .\romdrive\system\install\ mkdir .\romdrive\system\install\ > NUL
+REM Remove installation files from any previous tests
+if exist .\cdrive\Documents\InstTest\Equivalent*.txt del .\cdrive\Documents\InstTest\Equivalent*.txt > NUL
+
+xcopy /E /Y backup\cdrive cdrive > NUL
+xcopy /E /Y backup\romdrive romdrive > NUL
+
+copy \epoc32\winscw\c\tswi\tinterpretsisinteg\data\int_nr_option_01_stub.sis .\romdrive\system\install\int_nr_option_01_stub.sis /Y > NUL
+
+REM Remove installation files from any previous tests
+if exist \epoc32\winscw\c\Documents\abc*.txt del \epoc32\winscw\c\Documents\abc*.txt > NUL
+if exist \epoc32\winscw\c\sys\install\sisregistry\80000086\*.reg del \epoc32\winscw\c\sys\install\sisregistry\80000086\*.reg > NUL
+if exist \epoc32\winscw\c\sys\install\sisregistry\80000086\*.ctl del \epoc32\winscw\c\sys\install\sisregistry\80000086\*.ctl > NUL
+
+call interpretsis -z .\romdrive -c .\cdrive -s \epoc32\winscw\c\tswi\tsis\data\int_nr_option_03.sis -w info -l /epoc32/winscw/c/interpretsis_test_harness_db.txt > NUL
+
+if not %errorlevel%==0 GOTO LAST
+if not exist \epoc32\winscw\c\Documents mkdir \epoc32\winscw\c\Documents
+call xcopy .\cdrive\Documents \epoc32\winscw\c\Documents /S /Y > NUL
+call xcopy .\cdrive\sys\install\sisregistry \epoc32\winscw\c\sys\install\sisregistry /S /Y > NUL
+if exist \epoc32\winscw\c\sys\install\scr\scr.db del \epoc32\winscw\c\sys\install\scr\scr.db > NUL
+copy .\romdrive\sys\install\scr\provisioned\scr.db \epoc32\winscw\c\sys\install\scr\scr.db /Y > NUL
+if exist \epoc32\winscw\c\sys\install\sisregistry\backup.lst del \epoc32\winscw\c\sys\install\sisregistry\backup.lst > NUL
+if exist .\romdrive\system\install\int_nr_option_01_stub.sis del .\romdrive\system\install\int_nr_option_01_stub.sis > NUL
+
+ECHO ***ERRORCODE*** %errorlevel% PASS>>/epoc32/winscw/c/interpretsis_test_harness_db.txt
+GOTO END
+:LAST
+ECHO ***ERRORCODE*** %errorlevel% FAIL>>/epoc32/winscw/c/interpretsis_test_harness_db.txt
+:END
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/secureswitools/swisistools/test/tinterpretsisinteg/int_nr_option-33.bat Mon Mar 15 12:41:05 2010 +0200
@@ -0,0 +1,51 @@
+@rem
+@rem Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+@rem All rights reserved.
+@rem This component and the accompanying materials are made available
+@rem under the terms of the License "Eclipse Public License v1.0"
+@rem which accompanies this distribution, and is available
+@rem at the URL "http://www.eclipse.org/legal/sfl-v10.html".
+@rem
+@rem Initial Contributors:
+@rem Nokia Corporation - initial contribution.
+@rem
+@rem Contributors:
+@rem
+@rem Description:
+@rem
+@ECHO OFF
+REM int_nr_option_33
+REM int_nr_option_33 - SA(NR) over Rom Stub. This is a positive testcase. Expected result : SIS file is Installed.
+
+IF NOT EXIST .\backup\cdrive mkdir .\backup\cdrive > NUL
+IF NOT EXIST .\backup\romdrive mkdir .\backup\romdrive > NUL
+if not exist .\cdrive mkdir .\cdrive > NUL
+if not exist .\cdrive\Documents mkdir .\cdrive\Documents > NUL
+if not exist .\romdrive mkdir .\romdrive > NUL
+if not exist .\romdrive\system\ mkdir .\romdrive\system\ > NUL
+if not exist .\romdrive\system\install\ mkdir .\romdrive\system\install\ > NUL
+
+xcopy /E /Y backup\cdrive cdrive > NUL
+xcopy /E /Y backup\romdrive romdrive > NUL
+
+copy \epoc32\winscw\c\tswi\tinterpretsisinteg\data\int_nr_option_01_stub.sis .\romdrive\system\install\int_nr_option_01_stub.sis /Y > NUL
+
+REM Remove installation files from any previous tests
+if exist \epoc32\winscw\c\Documents\abc*.txt del \epoc32\winscw\c\Documents\abc*.txt > NUL
+if exist \epoc32\winscw\c\sys\install\sisregistry\80000086\*.reg del \epoc32\winscw\c\sys\install\sisregistry\80000086\*.reg > NUL
+if exist \epoc32\winscw\c\sys\install\sisregistry\80000086\*.ctl del \epoc32\winscw\c\sys\install\sisregistry\80000086\*.ctl > NUL
+
+call interpretsis -z .\romdrive -c .\cdrive -s \epoc32\winscw\c\tswi\tsis\data\int_nr_option_03.sis +nonremovablepkg -w info -l /epoc32/winscw/c/interpretsis_test_harness.txt > NUL
+
+if not %errorlevel%==0 GOTO LAST
+if not exist \epoc32\winscw\c\Documents mkdir \epoc32\winscw\c\Documents
+call xcopy .\cdrive\sys\install\sisregistry \epoc32\winscw\c\sys\install\sisregistry /S /Y > NUL
+call xcopy .\cdrive\Documents \epoc32\winscw\c\Documents /S /Y > NUL
+if exist \epoc32\winscw\c\sys\install\sisregistry\backup.lst del \epoc32\winscw\c\sys\install\sisregistry\backup.lst > NUL
+if exist .\romdrive\system\install\int_nr_option_01_stub.sis del .\romdrive\system\install\int_nr_option_01_stub.sis > NUL
+
+ECHO ***ERRORCODE*** %errorlevel% PASS>>/epoc32/winscw/c/interpretsis_test_harness.txt
+GOTO END
+:LAST
+ECHO ***ERRORCODE*** %errorlevel% FAIL>>/epoc32/winscw/c/interpretsis_test_harness.txt
+:END
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/secureswitools/swisistools/test/tinterpretsisinteg/int_nr_option-33_db.bat Mon Mar 15 12:41:05 2010 +0200
@@ -0,0 +1,55 @@
+@rem
+@rem Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+@rem All rights reserved.
+@rem This component and the accompanying materials are made available
+@rem under the terms of the License "Eclipse Public License v1.0"
+@rem which accompanies this distribution, and is available
+@rem at the URL "http://www.eclipse.org/legal/sfl-v10.html".
+@rem
+@rem Initial Contributors:
+@rem Nokia Corporation - initial contribution.
+@rem
+@rem Contributors:
+@rem
+@rem Description:
+@rem
+@ECHO OFF
+REM int_nr_option_33
+REM int_nr_option_33 - SA(NR) over Rom Stub. This is a positive testcase. Expected result : SIS file is Installed.
+
+IF NOT EXIST .\backup\cdrive mkdir .\backup\cdrive > NUL
+IF NOT EXIST .\backup\romdrive mkdir .\backup\romdrive > NUL
+if not exist .\cdrive mkdir .\cdrive > NUL
+if not exist .\cdrive\Documents mkdir .\cdrive\Documents > NUL
+if not exist .\romdrive mkdir .\romdrive > NUL
+if not exist .\romdrive\system\ mkdir .\romdrive\system\ > NUL
+if not exist .\romdrive\system\install\ mkdir .\romdrive\system\install\ > NUL
+REM Remove installation files from any previous tests
+if exist .\cdrive\Documents\InstTest\Equivalent*.txt del .\cdrive\Documents\InstTest\Equivalent*.txt > NUL
+
+xcopy /E /Y backup\cdrive cdrive > NUL
+xcopy /E /Y backup\romdrive romdrive > NUL
+
+copy \epoc32\winscw\c\tswi\tinterpretsisinteg\data\int_nr_option_01_stub.sis .\romdrive\system\install\int_nr_option_01_stub.sis /Y > NUL
+
+REM Remove installation files from any previous tests
+if exist \epoc32\winscw\c\Documents\abc*.txt del \epoc32\winscw\c\Documents\abc*.txt > NUL
+if exist \epoc32\winscw\c\sys\install\sisregistry\80000086\*.reg del \epoc32\winscw\c\sys\install\sisregistry\80000086\*.reg > NUL
+if exist \epoc32\winscw\c\sys\install\sisregistry\80000086\*.ctl del \epoc32\winscw\c\sys\install\sisregistry\80000086\*.ctl > NUL
+
+call interpretsis -z .\romdrive -c .\cdrive -s \epoc32\winscw\c\tswi\tsis\data\int_nr_option_03.sis +nonremovablepkg -w info -l /epoc32/winscw/c/interpretsis_test_harness_db.txt > NUL
+
+if not %errorlevel%==0 GOTO LAST
+if not exist \epoc32\winscw\c\Documents mkdir \epoc32\winscw\c\Documents
+call xcopy .\cdrive\Documents \epoc32\winscw\c\Documents /S /Y > NUL
+call xcopy .\cdrive\sys\install\sisregistry \epoc32\winscw\c\sys\install\sisregistry /S /Y > NUL
+if exist \epoc32\winscw\c\sys\install\scr\scr.db del \epoc32\winscw\c\sys\install\scr\scr.db > NUL
+copy .\romdrive\sys\install\scr\provisioned\scr.db \epoc32\winscw\c\sys\install\scr\scr.db /Y > NUL
+if exist \epoc32\winscw\c\sys\install\sisregistry\backup.lst del \epoc32\winscw\c\sys\install\sisregistry\backup.lst > NUL
+if exist .\romdrive\system\install\int_nr_option_01_stub.sis del .\romdrive\system\install\int_nr_option_01_stub.sis > NUL
+
+ECHO ***ERRORCODE*** %errorlevel% PASS>>/epoc32/winscw/c/interpretsis_test_harness_db.txt
+GOTO END
+:LAST
+ECHO ***ERRORCODE*** %errorlevel% FAIL>>/epoc32/winscw/c/interpretsis_test_harness_db.txt
+:END
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/secureswitools/swisistools/test/tinterpretsisinteg/int_nr_option-34.bat Mon Mar 15 12:41:05 2010 +0200
@@ -0,0 +1,51 @@
+@rem
+@rem Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+@rem All rights reserved.
+@rem This component and the accompanying materials are made available
+@rem under the terms of the License "Eclipse Public License v1.0"
+@rem which accompanies this distribution, and is available
+@rem at the URL "http://www.eclipse.org/legal/sfl-v10.html".
+@rem
+@rem Initial Contributors:
+@rem Nokia Corporation - initial contribution.
+@rem
+@rem Contributors:
+@rem
+@rem Description:
+@rem
+@ECHO OFF
+REM int_nr_option_34
+REM int_nr_option_34 - SP over Rom Stub. This is a positive testcase. Expected result : SIS file is Installed.
+
+IF NOT EXIST .\backup\cdrive mkdir .\backup\cdrive > NUL
+IF NOT EXIST .\backup\romdrive mkdir .\backup\romdrive > NUL
+if not exist .\cdrive mkdir .\cdrive > NUL
+if not exist .\cdrive\Documents mkdir .\cdrive\Documents > NUL
+if not exist .\romdrive mkdir .\romdrive > NUL
+if not exist .\romdrive\system\ mkdir .\romdrive\system\ > NUL
+if not exist .\romdrive\system\install\ mkdir .\romdrive\system\install\ > NUL
+
+xcopy /E /Y backup\cdrive cdrive > NUL
+xcopy /E /Y backup\romdrive romdrive > NUL
+
+copy \epoc32\winscw\c\tswi\tinterpretsisinteg\data\int_nr_option_01_stub.sis .\romdrive\system\install\int_nr_option_01_stub.sis /Y > NUL
+
+REM Remove installation files from any previous tests
+if exist \epoc32\winscw\c\Documents\abc*.txt del \epoc32\winscw\c\Documents\abc*.txt > NUL
+if exist \epoc32\winscw\c\sys\install\sisregistry\80000086\*.reg del \epoc32\winscw\c\sys\install\sisregistry\80000086\*.reg > NUL
+if exist \epoc32\winscw\c\sys\install\sisregistry\80000086\*.ctl del \epoc32\winscw\c\sys\install\sisregistry\80000086\*.ctl > NUL
+
+call interpretsis -z .\romdrive -c .\cdrive -s \epoc32\winscw\c\tswi\tsis\data\sp_int_nr_option_01.sis -w info -l /epoc32/winscw/c/interpretsis_test_harness.txt > NUL
+
+if not %errorlevel%==0 GOTO LAST
+if not exist \epoc32\winscw\c\Documents mkdir \epoc32\winscw\c\Documents
+call xcopy .\cdrive\sys\install\sisregistry \epoc32\winscw\c\sys\install\sisregistry /S /Y > NUL
+call xcopy .\cdrive\Documents \epoc32\winscw\c\Documents /S /Y > NUL
+if exist \epoc32\winscw\c\sys\install\sisregistry\backup.lst del \epoc32\winscw\c\sys\install\sisregistry\backup.lst > NUL
+if exist .\romdrive\system\install\int_nr_option_01_stub.sis del .\romdrive\system\install\int_nr_option_01_stub.sis > NUL
+
+ECHO ***ERRORCODE*** %errorlevel% PASS>>/epoc32/winscw/c/interpretsis_test_harness.txt
+GOTO END
+:LAST
+ECHO ***ERRORCODE*** %errorlevel% FAIL>>/epoc32/winscw/c/interpretsis_test_harness.txt
+:END
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/secureswitools/swisistools/test/tinterpretsisinteg/int_nr_option-34_db.bat Mon Mar 15 12:41:05 2010 +0200
@@ -0,0 +1,55 @@
+@rem
+@rem Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+@rem All rights reserved.
+@rem This component and the accompanying materials are made available
+@rem under the terms of the License "Eclipse Public License v1.0"
+@rem which accompanies this distribution, and is available
+@rem at the URL "http://www.eclipse.org/legal/sfl-v10.html".
+@rem
+@rem Initial Contributors:
+@rem Nokia Corporation - initial contribution.
+@rem
+@rem Contributors:
+@rem
+@rem Description:
+@rem
+@ECHO OFF
+REM int_nr_option_34
+REM int_nr_option_34 - SP over Rom Stub. This is a positive testcase. Expected result : SIS file is Installed.
+
+IF NOT EXIST .\backup\cdrive mkdir .\backup\cdrive > NUL
+IF NOT EXIST .\backup\romdrive mkdir .\backup\romdrive > NUL
+if not exist .\cdrive mkdir .\cdrive > NUL
+if not exist .\cdrive\Documents mkdir .\cdrive\Documents > NUL
+if not exist .\romdrive mkdir .\romdrive > NUL
+if not exist .\romdrive\system\ mkdir .\romdrive\system\ > NUL
+if not exist .\romdrive\system\install\ mkdir .\romdrive\system\install\ > NUL
+REM Remove installation files from any previous tests
+if exist .\cdrive\Documents\InstTest\Equivalent*.txt del .\cdrive\Documents\InstTest\Equivalent*.txt > NUL
+
+xcopy /E /Y backup\cdrive cdrive > NUL
+xcopy /E /Y backup\romdrive romdrive > NUL
+
+copy \epoc32\winscw\c\tswi\tinterpretsisinteg\data\int_nr_option_01_stub.sis .\romdrive\system\install\int_nr_option_01_stub.sis /Y > NUL
+
+REM Remove installation files from any previous tests
+if exist \epoc32\winscw\c\Documents\abc*.txt del \epoc32\winscw\c\Documents\abc*.txt > NUL
+if exist \epoc32\winscw\c\sys\install\sisregistry\80000086\*.reg del \epoc32\winscw\c\sys\install\sisregistry\80000086\*.reg > NUL
+if exist \epoc32\winscw\c\sys\install\sisregistry\80000086\*.ctl del \epoc32\winscw\c\sys\install\sisregistry\80000086\*.ctl > NUL
+
+call interpretsis -z .\romdrive -c .\cdrive -s \epoc32\winscw\c\tswi\tsis\data\sp_int_nr_option_01.sis -w info -l /epoc32/winscw/c/interpretsis_test_harness_db.txt > NUL
+
+if not %errorlevel%==0 GOTO LAST
+if not exist \epoc32\winscw\c\Documents mkdir \epoc32\winscw\c\Documents
+call xcopy .\cdrive\Documents \epoc32\winscw\c\Documents /S /Y > NUL
+call xcopy .\cdrive\sys\install\sisregistry \epoc32\winscw\c\sys\install\sisregistry /S /Y > NUL
+if exist \epoc32\winscw\c\sys\install\scr\scr.db del \epoc32\winscw\c\sys\install\scr\scr.db > NUL
+copy .\romdrive\sys\install\scr\provisioned\scr.db \epoc32\winscw\c\sys\install\scr\scr.db /Y > NUL
+if exist \epoc32\winscw\c\sys\install\sisregistry\backup.lst del \epoc32\winscw\c\sys\install\sisregistry\backup.lst > NUL
+if exist .\romdrive\system\install\int_nr_option_01_stub.sis del .\romdrive\system\install\int_nr_option_01_stub.sis > NUL
+
+ECHO ***ERRORCODE*** %errorlevel% PASS>>/epoc32/winscw/c/interpretsis_test_harness_db.txt
+GOTO END
+:LAST
+ECHO ***ERRORCODE*** %errorlevel% FAIL>>/epoc32/winscw/c/interpretsis_test_harness_db.txt
+:END
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/secureswitools/swisistools/test/tinterpretsisinteg/int_nr_option-35.bat Mon Mar 15 12:41:05 2010 +0200
@@ -0,0 +1,51 @@
+@rem
+@rem Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+@rem All rights reserved.
+@rem This component and the accompanying materials are made available
+@rem under the terms of the License "Eclipse Public License v1.0"
+@rem which accompanies this distribution, and is available
+@rem at the URL "http://www.eclipse.org/legal/sfl-v10.html".
+@rem
+@rem Initial Contributors:
+@rem Nokia Corporation - initial contribution.
+@rem
+@rem Contributors:
+@rem
+@rem Description:
+@rem
+@ECHO OFF
+REM int_nr_option_35
+REM int_nr_option_35 - SP(NR) over Rom Stub. This is a positive testcase. Expected result : SIS file is Installed.
+
+IF NOT EXIST .\backup\cdrive mkdir .\backup\cdrive > NUL
+IF NOT EXIST .\backup\romdrive mkdir .\backup\romdrive > NUL
+if not exist .\cdrive mkdir .\cdrive > NUL
+if not exist .\cdrive\Documents mkdir .\cdrive\Documents > NUL
+if not exist .\romdrive mkdir .\romdrive > NUL
+if not exist .\romdrive\system\ mkdir .\romdrive\system\ > NUL
+if not exist .\romdrive\system\install\ mkdir .\romdrive\system\install\ > NUL
+
+xcopy /E /Y backup\cdrive cdrive > NUL
+xcopy /E /Y backup\romdrive romdrive > NUL
+
+copy \epoc32\winscw\c\tswi\tinterpretsisinteg\data\int_nr_option_01_stub.sis .\romdrive\system\install\int_nr_option_01_stub.sis /Y > NUL
+
+REM Remove installation files from any previous tests
+if exist \epoc32\winscw\c\Documents\abc*.txt del \epoc32\winscw\c\Documents\abc*.txt > NUL
+if exist \epoc32\winscw\c\sys\install\sisregistry\80000086\*.reg del \epoc32\winscw\c\sys\install\sisregistry\80000086\*.reg > NUL
+if exist \epoc32\winscw\c\sys\install\sisregistry\80000086\*.ctl del \epoc32\winscw\c\sys\install\sisregistry\80000086\*.ctl > NUL
+
+call interpretsis -z .\romdrive -c .\cdrive -s \epoc32\winscw\c\tswi\tsis\data\sp_int_nr_option_01.sis +nonremovablepkg -w info -l /epoc32/winscw/c/interpretsis_test_harness.txt > NUL
+
+if not %errorlevel%==0 GOTO LAST
+if not exist \epoc32\winscw\c\Documents mkdir \epoc32\winscw\c\Documents
+call xcopy .\cdrive\sys\install\sisregistry \epoc32\winscw\c\sys\install\sisregistry /S /Y > NUL
+call xcopy .\cdrive\Documents \epoc32\winscw\c\Documents /S /Y > NUL
+if exist \epoc32\winscw\c\sys\install\sisregistry\backup.lst del \epoc32\winscw\c\sys\install\sisregistry\backup.lst > NUL
+if exist .\romdrive\system\install\int_nr_option_01_stub.sis del .\romdrive\system\install\int_nr_option_01_stub.sis > NUL
+
+ECHO ***ERRORCODE*** %errorlevel% PASS>>/epoc32/winscw/c/interpretsis_test_harness.txt
+GOTO END
+:LAST
+ECHO ***ERRORCODE*** %errorlevel% FAIL>>/epoc32/winscw/c/interpretsis_test_harness.txt
+:END
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/secureswitools/swisistools/test/tinterpretsisinteg/int_nr_option-35_db.bat Mon Mar 15 12:41:05 2010 +0200
@@ -0,0 +1,55 @@
+@rem
+@rem Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+@rem All rights reserved.
+@rem This component and the accompanying materials are made available
+@rem under the terms of the License "Eclipse Public License v1.0"
+@rem which accompanies this distribution, and is available
+@rem at the URL "http://www.eclipse.org/legal/sfl-v10.html".
+@rem
+@rem Initial Contributors:
+@rem Nokia Corporation - initial contribution.
+@rem
+@rem Contributors:
+@rem
+@rem Description:
+@rem
+@ECHO OFF
+REM int_nr_option_35
+REM int_nr_option_35 - SP(NR) over Rom Stub. This is a positive testcase. Expected result : SIS file is Installed.
+
+IF NOT EXIST .\backup\cdrive mkdir .\backup\cdrive > NUL
+IF NOT EXIST .\backup\romdrive mkdir .\backup\romdrive > NUL
+if not exist .\cdrive mkdir .\cdrive > NUL
+if not exist .\cdrive\Documents mkdir .\cdrive\Documents > NUL
+if not exist .\romdrive mkdir .\romdrive > NUL
+if not exist .\romdrive\system\ mkdir .\romdrive\system\ > NUL
+if not exist .\romdrive\system\install\ mkdir .\romdrive\system\install\ > NUL
+REM Remove installation files from any previous tests
+if exist .\cdrive\Documents\InstTest\Equivalent*.txt del .\cdrive\Documents\InstTest\Equivalent*.txt > NUL
+
+xcopy /E /Y backup\cdrive cdrive > NUL
+xcopy /E /Y backup\romdrive romdrive > NUL
+
+copy \epoc32\winscw\c\tswi\tinterpretsisinteg\data\int_nr_option_01_stub.sis .\romdrive\system\install\int_nr_option_01_stub.sis /Y > NUL
+
+REM Remove installation files from any previous tests
+if exist \epoc32\winscw\c\Documents\abc*.txt del \epoc32\winscw\c\Documents\abc*.txt > NUL
+if exist \epoc32\winscw\c\sys\install\sisregistry\80000086\*.reg del \epoc32\winscw\c\sys\install\sisregistry\80000086\*.reg > NUL
+if exist \epoc32\winscw\c\sys\install\sisregistry\80000086\*.ctl del \epoc32\winscw\c\sys\install\sisregistry\80000086\*.ctl > NUL
+
+call interpretsis -z .\romdrive -c .\cdrive -s \epoc32\winscw\c\tswi\tsis\data\sp_int_nr_option_01.sis +nonremovablepkg -w info -l /epoc32/winscw/c/interpretsis_test_harness_db.txt > NUL
+
+if not %errorlevel%==0 GOTO LAST
+if not exist \epoc32\winscw\c\Documents mkdir \epoc32\winscw\c\Documents
+call xcopy .\cdrive\Documents \epoc32\winscw\c\Documents /S /Y > NUL
+call xcopy .\cdrive\sys\install\sisregistry \epoc32\winscw\c\sys\install\sisregistry /S /Y > NUL
+if exist \epoc32\winscw\c\sys\install\scr\scr.db del \epoc32\winscw\c\sys\install\scr\scr.db > NUL
+copy .\romdrive\sys\install\scr\provisioned\scr.db \epoc32\winscw\c\sys\install\scr\scr.db /Y > NUL
+if exist \epoc32\winscw\c\sys\install\sisregistry\backup.lst del \epoc32\winscw\c\sys\install\sisregistry\backup.lst > NUL
+if exist .\romdrive\system\install\int_nr_option_01_stub.sis del .\romdrive\system\install\int_nr_option_01_stub.sis > NUL
+
+ECHO ***ERRORCODE*** %errorlevel% PASS>>/epoc32/winscw/c/interpretsis_test_harness_db.txt
+GOTO END
+:LAST
+ECHO ***ERRORCODE*** %errorlevel% FAIL>>/epoc32/winscw/c/interpretsis_test_harness_db.txt
+:END
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/secureswitools/swisistools/test/tinterpretsisinteg/int_nr_option-36.bat Mon Mar 15 12:41:05 2010 +0200
@@ -0,0 +1,51 @@
+@rem
+@rem Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+@rem All rights reserved.
+@rem This component and the accompanying materials are made available
+@rem under the terms of the License "Eclipse Public License v1.0"
+@rem which accompanies this distribution, and is available
+@rem at the URL "http://www.eclipse.org/legal/sfl-v10.html".
+@rem
+@rem Initial Contributors:
+@rem Nokia Corporation - initial contribution.
+@rem
+@rem Contributors:
+@rem
+@rem Description:
+@rem
+@ECHO OFF
+REM int_nr_option_36
+REM int_nr_option_36 - PU over Rom Stub. This is a positive testcase. Expected result : SIS file is Installed.
+
+IF NOT EXIST .\backup\cdrive mkdir .\backup\cdrive > NUL
+IF NOT EXIST .\backup\romdrive mkdir .\backup\romdrive > NUL
+if not exist .\cdrive mkdir .\cdrive > NUL
+if not exist .\cdrive\Documents mkdir .\cdrive\Documents > NUL
+if not exist .\romdrive mkdir .\romdrive > NUL
+if not exist .\romdrive\system\ mkdir .\romdrive\system\ > NUL
+if not exist .\romdrive\system\install\ mkdir .\romdrive\system\install\ > NUL
+
+xcopy /E /Y backup\cdrive cdrive > NUL
+xcopy /E /Y backup\romdrive romdrive > NUL
+
+copy \epoc32\winscw\c\tswi\tinterpretsisinteg\data\int_nr_option_01_stub.sis .\romdrive\system\install\int_nr_option_01_stub.sis /Y > NUL
+
+REM Remove installation files from any previous tests
+if exist \epoc32\winscw\c\Documents\abc*.txt del \epoc32\winscw\c\Documents\abc*.txt > NUL
+if exist \epoc32\winscw\c\sys\install\sisregistry\80000086\*.reg del \epoc32\winscw\c\sys\install\sisregistry\80000086\*.reg > NUL
+if exist \epoc32\winscw\c\sys\install\sisregistry\80000086\*.ctl del \epoc32\winscw\c\sys\install\sisregistry\80000086\*.ctl > NUL
+
+call interpretsis -z .\romdrive -c .\cdrive -s \epoc32\winscw\c\tswi\tsis\data\pu_int_nr_option_01.sis -w info -l /epoc32/winscw/c/interpretsis_test_harness.txt > NUL
+
+if not %errorlevel%==0 GOTO LAST
+if not exist \epoc32\winscw\c\Documents mkdir \epoc32\winscw\c\Documents
+call xcopy .\cdrive\sys\install\sisregistry \epoc32\winscw\c\sys\install\sisregistry /S /Y > NUL
+call xcopy .\cdrive\Documents \epoc32\winscw\c\Documents /S /Y > NUL
+if exist \epoc32\winscw\c\sys\install\sisregistry\backup.lst del \epoc32\winscw\c\sys\install\sisregistry\backup.lst > NUL
+if exist .\romdrive\system\install\int_nr_option_01_stub.sis del .\romdrive\system\install\int_nr_option_01_stub.sis > NUL
+
+ECHO ***ERRORCODE*** %errorlevel% PASS>>/epoc32/winscw/c/interpretsis_test_harness.txt
+GOTO END
+:LAST
+ECHO ***ERRORCODE*** %errorlevel% FAIL>>/epoc32/winscw/c/interpretsis_test_harness.txt
+:END
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/secureswitools/swisistools/test/tinterpretsisinteg/int_nr_option-36_db.bat Mon Mar 15 12:41:05 2010 +0200
@@ -0,0 +1,55 @@
+@rem
+@rem Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+@rem All rights reserved.
+@rem This component and the accompanying materials are made available
+@rem under the terms of the License "Eclipse Public License v1.0"
+@rem which accompanies this distribution, and is available
+@rem at the URL "http://www.eclipse.org/legal/sfl-v10.html".
+@rem
+@rem Initial Contributors:
+@rem Nokia Corporation - initial contribution.
+@rem
+@rem Contributors:
+@rem
+@rem Description:
+@rem
+@ECHO OFF
+REM int_nr_option_36
+REM int_nr_option_36 - PU over Rom Stub. This is a positive testcase. Expected result : SIS file is Installed.
+
+IF NOT EXIST .\backup\cdrive mkdir .\backup\cdrive > NUL
+IF NOT EXIST .\backup\romdrive mkdir .\backup\romdrive > NUL
+if not exist .\cdrive mkdir .\cdrive > NUL
+if not exist .\cdrive\Documents mkdir .\cdrive\Documents > NUL
+if not exist .\romdrive mkdir .\romdrive > NUL
+if not exist .\romdrive\system\ mkdir .\romdrive\system\ > NUL
+if not exist .\romdrive\system\install\ mkdir .\romdrive\system\install\ > NUL
+REM Remove installation files from any previous tests
+if exist .\cdrive\Documents\InstTest\Equivalent*.txt del .\cdrive\Documents\InstTest\Equivalent*.txt > NUL
+
+xcopy /E /Y backup\cdrive cdrive > NUL
+xcopy /E /Y backup\romdrive romdrive > NUL
+
+copy \epoc32\winscw\c\tswi\tinterpretsisinteg\data\int_nr_option_01_stub.sis .\romdrive\system\install\int_nr_option_01_stub.sis /Y > NUL
+
+REM Remove installation files from any previous tests
+if exist \epoc32\winscw\c\Documents\abc*.txt del \epoc32\winscw\c\Documents\abc*.txt > NUL
+if exist \epoc32\winscw\c\sys\install\sisregistry\80000086\*.reg del \epoc32\winscw\c\sys\install\sisregistry\80000086\*.reg > NUL
+if exist \epoc32\winscw\c\sys\install\sisregistry\80000086\*.ctl del \epoc32\winscw\c\sys\install\sisregistry\80000086\*.ctl > NUL
+
+call interpretsis -z .\romdrive -c .\cdrive -s \epoc32\winscw\c\tswi\tsis\data\pu_int_nr_option_01.sis -w info -l /epoc32/winscw/c/interpretsis_test_harness_db.txt > NUL
+
+if not %errorlevel%==0 GOTO LAST
+if not exist \epoc32\winscw\c\Documents mkdir \epoc32\winscw\c\Documents
+call xcopy .\cdrive\Documents \epoc32\winscw\c\Documents /S /Y > NUL
+call xcopy .\cdrive\sys\install\sisregistry \epoc32\winscw\c\sys\install\sisregistry /S /Y > NUL
+if exist \epoc32\winscw\c\sys\install\scr\scr.db del \epoc32\winscw\c\sys\install\scr\scr.db > NUL
+copy .\romdrive\sys\install\scr\provisioned\scr.db \epoc32\winscw\c\sys\install\scr\scr.db /Y > NUL
+if exist \epoc32\winscw\c\sys\install\sisregistry\backup.lst del \epoc32\winscw\c\sys\install\sisregistry\backup.lst > NUL
+if exist .\romdrive\system\install\int_nr_option_01_stub.sis del .\romdrive\system\install\int_nr_option_01_stub.sis > NUL
+
+ECHO ***ERRORCODE*** %errorlevel% PASS>>/epoc32/winscw/c/interpretsis_test_harness_db.txt
+GOTO END
+:LAST
+ECHO ***ERRORCODE*** %errorlevel% FAIL>>/epoc32/winscw/c/interpretsis_test_harness_db.txt
+:END
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/secureswitools/swisistools/test/tinterpretsisinteg/int_nr_option-37.bat Mon Mar 15 12:41:05 2010 +0200
@@ -0,0 +1,51 @@
+@rem
+@rem Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+@rem All rights reserved.
+@rem This component and the accompanying materials are made available
+@rem under the terms of the License "Eclipse Public License v1.0"
+@rem which accompanies this distribution, and is available
+@rem at the URL "http://www.eclipse.org/legal/sfl-v10.html".
+@rem
+@rem Initial Contributors:
+@rem Nokia Corporation - initial contribution.
+@rem
+@rem Contributors:
+@rem
+@rem Description:
+@rem
+@ECHO OFF
+REM int_nr_option_36
+REM int_nr_option_36 - PU(NR) over Rom Stub. This is a positive testcase. Expected result : SIS file is Installed.
+
+IF NOT EXIST .\backup\cdrive mkdir .\backup\cdrive > NUL
+IF NOT EXIST .\backup\romdrive mkdir .\backup\romdrive > NUL
+if not exist .\cdrive mkdir .\cdrive > NUL
+if not exist .\cdrive\Documents mkdir .\cdrive\Documents > NUL
+if not exist .\romdrive mkdir .\romdrive > NUL
+if not exist .\romdrive\system\ mkdir .\romdrive\system\ > NUL
+if not exist .\romdrive\system\install\ mkdir .\romdrive\system\install\ > NUL
+
+xcopy /E /Y backup\cdrive cdrive > NUL
+xcopy /E /Y backup\romdrive romdrive > NUL
+
+copy \epoc32\winscw\c\tswi\tinterpretsisinteg\data\int_nr_option_01_stub.sis .\romdrive\system\install\int_nr_option_01_stub.sis /Y > NUL
+
+REM Remove installation files from any previous tests
+if exist \epoc32\winscw\c\Documents\abc*.txt del \epoc32\winscw\c\Documents\abc*.txt > NUL
+if exist \epoc32\winscw\c\sys\install\sisregistry\80000086\*.reg del \epoc32\winscw\c\sys\install\sisregistry\80000086\*.reg > NUL
+if exist \epoc32\winscw\c\sys\install\sisregistry\80000086\*.ctl del \epoc32\winscw\c\sys\install\sisregistry\80000086\*.ctl > NUL
+
+call interpretsis -z .\romdrive -c .\cdrive -s \epoc32\winscw\c\tswi\tsis\data\pu_int_nr_option_01.sis +nonremovablepkg -w info -l /epoc32/winscw/c/interpretsis_test_harness.txt > NUL
+
+if not %errorlevel%==0 GOTO LAST
+if not exist \epoc32\winscw\c\Documents mkdir \epoc32\winscw\c\Documents
+call xcopy .\cdrive\sys\install\sisregistry \epoc32\winscw\c\sys\install\sisregistry /S /Y > NUL
+call xcopy .\cdrive\Documents \epoc32\winscw\c\Documents /S /Y > NUL
+if exist \epoc32\winscw\c\sys\install\sisregistry\backup.lst del \epoc32\winscw\c\sys\install\sisregistry\backup.lst > NUL
+if exist .\romdrive\system\install\int_nr_option_01_stub.sis del .\romdrive\system\install\int_nr_option_01_stub.sis > NUL
+
+ECHO ***ERRORCODE*** %errorlevel% PASS>>/epoc32/winscw/c/interpretsis_test_harness.txt
+GOTO END
+:LAST
+ECHO ***ERRORCODE*** %errorlevel% FAIL>>/epoc32/winscw/c/interpretsis_test_harness.txt
+:END
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/secureswitools/swisistools/test/tinterpretsisinteg/int_nr_option-37_db.bat Mon Mar 15 12:41:05 2010 +0200
@@ -0,0 +1,55 @@
+@rem
+@rem Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+@rem All rights reserved.
+@rem This component and the accompanying materials are made available
+@rem under the terms of the License "Eclipse Public License v1.0"
+@rem which accompanies this distribution, and is available
+@rem at the URL "http://www.eclipse.org/legal/sfl-v10.html".
+@rem
+@rem Initial Contributors:
+@rem Nokia Corporation - initial contribution.
+@rem
+@rem Contributors:
+@rem
+@rem Description:
+@rem
+@ECHO OFF
+REM int_nr_option_36
+REM int_nr_option_36 - PU(NR) over Rom Stub. This is a positive testcase. Expected result : SIS file is Installed.
+
+IF NOT EXIST .\backup\cdrive mkdir .\backup\cdrive > NUL
+IF NOT EXIST .\backup\romdrive mkdir .\backup\romdrive > NUL
+if not exist .\cdrive mkdir .\cdrive > NUL
+if not exist .\cdrive\Documents mkdir .\cdrive\Documents > NUL
+if not exist .\romdrive mkdir .\romdrive > NUL
+if not exist .\romdrive\system\ mkdir .\romdrive\system\ > NUL
+if not exist .\romdrive\system\install\ mkdir .\romdrive\system\install\ > NUL
+REM Remove installation files from any previous tests
+if exist .\cdrive\Documents\InstTest\Equivalent*.txt del .\cdrive\Documents\InstTest\Equivalent*.txt > NUL
+
+xcopy /E /Y backup\cdrive cdrive > NUL
+xcopy /E /Y backup\romdrive romdrive > NUL
+
+copy \epoc32\winscw\c\tswi\tinterpretsisinteg\data\int_nr_option_01_stub.sis .\romdrive\system\install\int_nr_option_01_stub.sis /Y > NUL
+
+REM Remove installation files from any previous tests
+if exist \epoc32\winscw\c\Documents\abc*.txt del \epoc32\winscw\c\Documents\abc*.txt > NUL
+if exist \epoc32\winscw\c\sys\install\sisregistry\80000086\*.reg del \epoc32\winscw\c\sys\install\sisregistry\80000086\*.reg > NUL
+if exist \epoc32\winscw\c\sys\install\sisregistry\80000086\*.ctl del \epoc32\winscw\c\sys\install\sisregistry\80000086\*.ctl > NUL
+
+call interpretsis -z .\romdrive -c .\cdrive -s \epoc32\winscw\c\tswi\tsis\data\pu_int_nr_option_01.sis +nonremovablepkg -w info -l /epoc32/winscw/c/interpretsis_test_harness_db.txt > NUL
+
+if not %errorlevel%==0 GOTO LAST
+if not exist \epoc32\winscw\c\Documents mkdir \epoc32\winscw\c\Documents
+call xcopy .\cdrive\Documents \epoc32\winscw\c\Documents /S /Y > NUL
+call xcopy .\cdrive\sys\install\sisregistry \epoc32\winscw\c\sys\install\sisregistry /S /Y > NUL
+if exist \epoc32\winscw\c\sys\install\scr\scr.db del \epoc32\winscw\c\sys\install\scr\scr.db > NUL
+copy .\romdrive\sys\install\scr\provisioned\scr.db \epoc32\winscw\c\sys\install\scr\scr.db /Y > NUL
+if exist \epoc32\winscw\c\sys\install\sisregistry\backup.lst del \epoc32\winscw\c\sys\install\sisregistry\backup.lst > NUL
+if exist .\romdrive\system\install\int_nr_option_01_stub.sis del .\romdrive\system\install\int_nr_option_01_stub.sis > NUL
+
+ECHO ***ERRORCODE*** %errorlevel% PASS>>/epoc32/winscw/c/interpretsis_test_harness_db.txt
+GOTO END
+:LAST
+ECHO ***ERRORCODE*** %errorlevel% FAIL>>/epoc32/winscw/c/interpretsis_test_harness_db.txt
+:END
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/secureswitools/swisistools/test/tinterpretsisinteg/int_nr_option-38.bat Mon Mar 15 12:41:05 2010 +0200
@@ -0,0 +1,54 @@
+@rem
+@rem Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+@rem All rights reserved.
+@rem This component and the accompanying materials are made available
+@rem under the terms of the License "Eclipse Public License v1.0"
+@rem which accompanies this distribution, and is available
+@rem at the URL "http://www.eclipse.org/legal/sfl-v10.html".
+@rem
+@rem Initial Contributors:
+@rem Nokia Corporation - initial contribution.
+@rem
+@rem Contributors:
+@rem
+@rem Description:
+@rem
+@ECHO OFF
+REM int_nr_option_38
+REM int_nr_option_38 - Install a SIS file with NR CLI option and +mcard option set. This is a positive testcase. Expected Result : SIS file is Installed.
+
+IF NOT EXIST .\backup\cdrive mkdir .\backup\cdrive > NUL
+IF NOT EXIST .\backup\romdrive mkdir .\backup\romdrive > NUL
+if not exist .\cdrive mkdir .\cdrive > NUL
+if not exist .\cdrive\Documents mkdir .\cdrive\Documents > NUL
+if not exist .\romdrive mkdir .\romdrive > NUL
+if not exist .\romdrive\system\ mkdir .\romdrive\system\ > NUL
+if not exist .\romdrive\system\install\ mkdir .\romdrive\system\install\ > NUL
+if not exist \epoc32\winscw\e mkdir \epoc32\winscw\e
+
+xcopy /E /Y backup\cdrive cdrive > NUL
+xcopy /E /Y backup\romdrive romdrive > NUL
+
+REM Remove installation files from any previous tests
+if exist \epoc32\winscw\c\Documents\abc*.txt del \epoc32\winscw\c\Documents\abc*.txt > NUL
+if exist \epoc32\winscw\c\sys\install\sisregistry\80000086\*.reg del \epoc32\winscw\c\sys\install\sisregistry\80000086\*.reg > NUL
+if exist \epoc32\winscw\c\sys\install\sisregistry\80000086\*.ctl del \epoc32\winscw\c\sys\install\sisregistry\80000086\*.ctl > NUL
+if exist \epoc32\winscw\e\Documents\abc*.txt del \epoc32\winscw\e\Documents\abc*.txt > NUL
+if exist \epoc32\winscw\e\sys\install\sisregistry\80000086\*.reg del \epoc32\winscw\e\sys\install\sisregistry\80000086\*.reg > NUL
+if exist \epoc32\winscw\e\sys\install\sisregistry\80000086\*.ctl del \epoc32\winscw\e\sys\install\sisregistry\80000086\*.ctl > NUL
+
+call interpretsis -z .\romdrive -c .\cdrive -s \epoc32\winscw\c\tswi\tsis\data\int_nr_option_01.sis +e +mcard +nonremovablepkg -w info -i \epoc32\winscw\c\tswi\tinterpretsisinteg\parameters_file\int_nr_option_38.txt -l /epoc32/winscw/c/interpretsis_test_harness.txt > NUL
+
+if not %errorlevel%==0 GOTO LAST
+if not exist \epoc32\winscw\c\Documents mkdir \epoc32\winscw\c\Documents
+call xcopy .\cdrive\sys\install\sisregistry \epoc32\winscw\c\sys\install\sisregistry /S /Y > NUL
+call xcopy .\cdrive\Documents \epoc32\winscw\c\Documents /S /Y > NUL
+if exist \epoc32\winscw\c\sys\install\sisregistry\backup.lst del \epoc32\winscw\c\sys\install\sisregistry\backup.lst > NUL
+if exist \epoc32\winscw\e\sys\install\sisregistry\backup.lst del \epoc32\winscw\e\sys\install\sisregistry\backup.lst > NUL
+if not exist \epoc32\winscw\e\Documents\abc1.txt GOTO LAST
+
+ECHO ***ERRORCODE*** %errorlevel% PASS>>/epoc32/winscw/c/interpretsis_test_harness.txt
+GOTO END
+:LAST
+ECHO ***ERRORCODE*** %errorlevel% FAIL>>/epoc32/winscw/c/interpretsis_test_harness.txt
+:END
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/secureswitools/swisistools/test/tinterpretsisinteg/int_nr_option-38_db.bat Mon Mar 15 12:41:05 2010 +0200
@@ -0,0 +1,58 @@
+@rem
+@rem Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+@rem All rights reserved.
+@rem This component and the accompanying materials are made available
+@rem under the terms of the License "Eclipse Public License v1.0"
+@rem which accompanies this distribution, and is available
+@rem at the URL "http://www.eclipse.org/legal/sfl-v10.html".
+@rem
+@rem Initial Contributors:
+@rem Nokia Corporation - initial contribution.
+@rem
+@rem Contributors:
+@rem
+@rem Description:
+@rem
+@ECHO OFF
+REM int_nr_option_38
+REM int_nr_option_38 - Install a SIS file with NR CLI option and +mcard option set. This is a positive testcase. Expected Result : SIS file is Installed.
+
+IF NOT EXIST .\backup\cdrive mkdir .\backup\cdrive > NUL
+IF NOT EXIST .\backup\romdrive mkdir .\backup\romdrive > NUL
+if not exist .\cdrive mkdir .\cdrive > NUL
+if not exist .\cdrive\Documents mkdir .\cdrive\Documents > NUL
+if not exist .\romdrive mkdir .\romdrive > NUL
+if not exist .\romdrive\system\ mkdir .\romdrive\system\ > NUL
+if not exist .\romdrive\system\install\ mkdir .\romdrive\system\install\ > NUL
+if not exist \epoc32\winscw\e mkdir \epoc32\winscw\e
+REM Remove installation files from any previous tests
+if exist .\cdrive\Documents\InstTest\Equivalent*.txt del .\cdrive\Documents\InstTest\Equivalent*.txt > NUL
+
+xcopy /E /Y backup\cdrive cdrive > NUL
+xcopy /E /Y backup\romdrive romdrive > NUL
+
+REM Remove installation files from any previous tests
+if exist \epoc32\winscw\c\Documents\abc*.txt del \epoc32\winscw\c\Documents\abc*.txt > NUL
+if exist \epoc32\winscw\c\sys\install\sisregistry\80000086\*.reg del \epoc32\winscw\c\sys\install\sisregistry\80000086\*.reg > NUL
+if exist \epoc32\winscw\c\sys\install\sisregistry\80000086\*.ctl del \epoc32\winscw\c\sys\install\sisregistry\80000086\*.ctl > NUL
+if exist \epoc32\winscw\e\Documents\abc*.txt del \epoc32\winscw\e\Documents\abc*.txt > NUL
+if exist \epoc32\winscw\e\sys\install\sisregistry\80000086\*.reg del \epoc32\winscw\e\sys\install\sisregistry\80000086\*.reg > NUL
+if exist \epoc32\winscw\e\sys\install\sisregistry\80000086\*.ctl del \epoc32\winscw\e\sys\install\sisregistry\80000086\*.ctl > NUL
+
+call interpretsis -z .\romdrive -c .\cdrive -s \epoc32\winscw\c\tswi\tsis\data\int_nr_option_01.sis +e +mcard +nonremovablepkg -w info -i \epoc32\winscw\c\tswi\tinterpretsisinteg\parameters_file\int_nr_option_38.txt -l /epoc32/winscw/c/interpretsis_test_harness_db.txt > NUL
+
+if not %errorlevel%==0 GOTO LAST
+if not exist \epoc32\winscw\c\Documents mkdir \epoc32\winscw\c\Documents
+call xcopy .\cdrive\Documents \epoc32\winscw\c\Documents /S /Y > NUL
+call xcopy .\cdrive\sys\install\sisregistry \epoc32\winscw\c\sys\install\sisregistry /S /Y > NUL
+if exist \epoc32\winscw\c\sys\install\scr\scr.db del \epoc32\winscw\c\sys\install\scr\scr.db > NUL
+copy .\romdrive\sys\install\scr\provisioned\scr.db \epoc32\winscw\c\sys\install\scr\scr.db /Y > NUL
+if exist \epoc32\winscw\c\sys\install\sisregistry\backup.lst del \epoc32\winscw\c\sys\install\sisregistry\backup.lst > NUL
+if exist \epoc32\winscw\e\sys\install\sisregistry\backup.lst del \epoc32\winscw\e\sys\install\sisregistry\backup.lst > NUL
+if not exist \epoc32\winscw\e\Documents\abc1.txt GOTO LAST
+
+ECHO ***ERRORCODE*** %errorlevel% PASS>>/epoc32/winscw/c/interpretsis_test_harness_db.txt
+GOTO END
+:LAST
+ECHO ***ERRORCODE*** %errorlevel% FAIL>>/epoc32/winscw/c/interpretsis_test_harness_db.txt
+:END
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/secureswitools/swisistools/test/tinterpretsisinteg/int_nr_option-39.bat Mon Mar 15 12:41:05 2010 +0200
@@ -0,0 +1,71 @@
+@rem
+@rem Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+@rem All rights reserved.
+@rem This component and the accompanying materials are made available
+@rem under the terms of the License "Eclipse Public License v1.0"
+@rem which accompanies this distribution, and is available
+@rem at the URL "http://www.eclipse.org/legal/sfl-v10.html".
+@rem
+@rem Initial Contributors:
+@rem Nokia Corporation - initial contribution.
+@rem
+@rem Contributors:
+@rem
+@rem Description:
+@rem
+@ECHO OFF
+REM int_nr_option_39
+REM int_nr_option_39 - Install a SIS file with NR CLI option and +mcardalone option set. This is a positive testcase. Expected Result : SIS file is Installed.
+
+IF NOT EXIST .\backup\cdrive mkdir .\backup\cdrive > NUL
+IF NOT EXIST .\backup\romdrive mkdir .\backup\romdrive > NUL
+if not exist .\cdrive mkdir .\cdrive > NUL
+if not exist .\cdrive\Documents mkdir .\cdrive\Documents > NUL
+if not exist .\romdrive mkdir .\romdrive > NUL
+if not exist .\romdrive\system\ mkdir .\romdrive\system\ > NUL
+if not exist .\romdrive\system\install\ mkdir .\romdrive\system\install\ > NUL
+if not exist \epoc32\winscw\e mkdir \epoc32\winscw\e
+
+xcopy /E /Y backup\cdrive cdrive > NUL
+xcopy /E /Y backup\romdrive romdrive > NUL
+
+REM Remove installation files from any previous tests
+if exist \epoc32\winscw\c\Documents\abc*.txt del \epoc32\winscw\c\Documents\abc*.txt > NUL
+if exist \epoc32\winscw\c\sys\install\sisregistry\80000086\*.reg del \epoc32\winscw\c\sys\install\sisregistry\80000086\*.reg > NUL
+if exist \epoc32\winscw\c\sys\install\sisregistry\80000086\*.ctl del \epoc32\winscw\c\sys\install\sisregistry\80000086\*.ctl > NUL
+if exist \epoc32\winscw\c\sys\install\sisregistry\80000087\*.reg del \epoc32\winscw\c\sys\install\sisregistry\80000087\*.reg > NUL
+if exist \epoc32\winscw\c\sys\install\sisregistry\80000087\*.ctl del \epoc32\winscw\c\sys\install\sisregistry\80000087\*.ctl > NUL
+if exist \epoc32\winscw\e\Documents\abc*.txt del \epoc32\winscw\e\Documents\abc*.txt > NUL
+if exist \epoc32\winscw\e\sys\install\sisregistry\80000086\*.reg del \epoc32\winscw\e\sys\install\sisregistry\80000086\*.reg > NUL
+if exist \epoc32\winscw\e\sys\install\sisregistry\80000086\*.ctl del \epoc32\winscw\e\sys\install\sisregistry\80000086\*.ctl > NUL
+
+
+call interpretsis -z .\romdrive -c .\cdrive -s \epoc32\winscw\c\tswi\tsis\data\int_nr_option_01.sis +e +mcardalone +nonremovablepkg -w info -i \epoc32\winscw\c\tswi\tinterpretsisinteg\parameters_file\int_nr_option_38.txt -l /epoc32/winscw/c/interpretsis_test_harness.txt > NUL
+
+if not %errorlevel%==0 GOTO LAST
+if not exist \epoc32\winscw\c\Documents mkdir \epoc32\winscw\c\Documents
+call xcopy .\cdrive\Documents \epoc32\winscw\c\Documents /S /Y > NUL
+if exist \epoc32\winscw\c\sys\install\sisregistry\backup.lst del \epoc32\winscw\c\sys\install\sisregistry\backup.lst > NUL
+if exist \epoc32\winscw\e\sys\install\sisregistry\backup.lst del \epoc32\winscw\e\sys\install\sisregistry\backup.lst > NUL
+if not exist \epoc32\winscw\e\Documents\abc1.txt GOTO LAST
+@rem Cleaning all residue file
+if exist \epoc32\winscw\e\Documents\abc*.txt del \epoc32\winscw\e\Documents\abc*.txt > NUL
+if exist \epoc32\winscw\e\sys\install\sisregistry\80000086\*.reg del \epoc32\winscw\e\sys\install\sisregistry\80000086\*.reg > NUL
+if exist \epoc32\winscw\e\sys\install\sisregistry\80000086\*.ctl del \epoc32\winscw\e\sys\install\sisregistry\80000086\*.ctl > NUL
+if exist \epoc32\winscw\c\sys\install\sisregistry\80000086 rmdir \epoc32\winscw\c\sys\install\sisregistry\80000086 > NUL
+if exist \epoc32\winscw\c\sys\install\sisregistry\80000087 rmdir \epoc32\winscw\c\sys\install\sisregistry\80000087 > NUL
+if exist \epoc32\winscw\e\sys\install\sisregistry\80000086 rmdir \epoc32\winscw\e\sys\install\sisregistry\80000086 > NUL
+if exist \epoc32\winscw\e\sys\install\sisregistry rmdir \epoc32\winscw\e\sys\install\sisregistry > NUL
+if exist \epoc32\winscw\e\sys\install rmdir \epoc32\winscw\e\sys\install > NUL
+if exist \epoc32\winscw\e\sys rmdir \epoc32\winscw\e\sys > NUL
+if exist \epoc32\winscw\e\private\10202dce\*.sis del \epoc32\winscw\e\private\10202dce\*.sis > NUL
+if exist \epoc32\winscw\e\private\10202dce rmdir \epoc32\winscw\e\private\10202dce > NUL
+if exist \epoc32\winscw\e\private rmdir \epoc32\winscw\e\private > NUL
+if exist \epoc32\winscw\e\Documents rmdir \epoc32\winscw\e\Documents > NUL
+if exist \epoc32\winscw\e rmdir \epoc32\winscw\e > NUL
+
+ECHO ***ERRORCODE*** %errorlevel% PASS>>/epoc32/winscw/c/interpretsis_test_harness.txt
+GOTO END
+:LAST
+ECHO ***ERRORCODE*** %errorlevel% FAIL>>/epoc32/winscw/c/interpretsis_test_harness.txt
+:END
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/secureswitools/swisistools/test/tinterpretsisinteg/int_nr_option-39_db.bat Mon Mar 15 12:41:05 2010 +0200
@@ -0,0 +1,76 @@
+@rem
+@rem Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+@rem All rights reserved.
+@rem This component and the accompanying materials are made available
+@rem under the terms of the License "Eclipse Public License v1.0"
+@rem which accompanies this distribution, and is available
+@rem at the URL "http://www.eclipse.org/legal/sfl-v10.html".
+@rem
+@rem Initial Contributors:
+@rem Nokia Corporation - initial contribution.
+@rem
+@rem Contributors:
+@rem
+@rem Description:
+@rem
+@ECHO OFF
+REM int_nr_option_39
+REM int_nr_option_39 - Install a SIS file with NR CLI option and +mcardalone option set. This is a positive testcase. Expected Result : SIS file is Installed.
+
+IF NOT EXIST .\backup\cdrive mkdir .\backup\cdrive > NUL
+IF NOT EXIST .\backup\romdrive mkdir .\backup\romdrive > NUL
+if not exist .\cdrive mkdir .\cdrive > NUL
+if not exist .\cdrive\Documents mkdir .\cdrive\Documents > NUL
+if not exist .\romdrive mkdir .\romdrive > NUL
+if not exist .\romdrive\system\ mkdir .\romdrive\system\ > NUL
+if not exist .\romdrive\system\install\ mkdir .\romdrive\system\install\ > NUL
+if not exist \epoc32\winscw\e mkdir \epoc32\winscw\e
+REM Remove installation files from any previous tests
+if exist .\cdrive\Documents\InstTest\Equivalent*.txt del .\cdrive\Documents\InstTest\Equivalent*.txt > NUL
+
+xcopy /E /Y backup\cdrive cdrive > NUL
+xcopy /E /Y backup\romdrive romdrive > NUL
+
+REM Remove installation files from any previous tests
+if exist \epoc32\winscw\c\Documents\abc*.txt del \epoc32\winscw\c\Documents\abc*.txt > NUL
+if exist \epoc32\winscw\c\sys\install\sisregistry\80000086\*.reg del \epoc32\winscw\c\sys\install\sisregistry\80000086\*.reg > NUL
+if exist \epoc32\winscw\c\sys\install\sisregistry\80000086\*.ctl del \epoc32\winscw\c\sys\install\sisregistry\80000086\*.ctl > NUL
+if exist \epoc32\winscw\c\sys\install\sisregistry\80000087\*.reg del \epoc32\winscw\c\sys\install\sisregistry\80000087\*.reg > NUL
+if exist \epoc32\winscw\c\sys\install\sisregistry\80000087\*.ctl del \epoc32\winscw\c\sys\install\sisregistry\80000087\*.ctl > NUL
+if exist \epoc32\winscw\e\Documents\abc*.txt del \epoc32\winscw\e\Documents\abc*.txt > NUL
+if exist \epoc32\winscw\e\sys\install\sisregistry\80000086\*.reg del \epoc32\winscw\e\sys\install\sisregistry\80000086\*.reg > NUL
+if exist \epoc32\winscw\e\sys\install\sisregistry\80000086\*.ctl del \epoc32\winscw\e\sys\install\sisregistry\80000086\*.ctl > NUL
+
+
+call interpretsis -z .\romdrive -c .\cdrive -s \epoc32\winscw\c\tswi\tsis\data\int_nr_option_01.sis +e +mcardalone +nonremovablepkg -w info -i \epoc32\winscw\c\tswi\tinterpretsisinteg\parameters_file\int_nr_option_38.txt -l /epoc32/winscw/c/interpretsis_test_harness_db.txt > NUL
+
+if not %errorlevel%==0 GOTO LAST
+if not exist \epoc32\winscw\c\Documents mkdir \epoc32\winscw\c\Documents
+call xcopy .\cdrive\Documents \epoc32\winscw\c\Documents /S /Y > NUL
+REM call xcopy .\cdrive\sys\install\sisregistry \epoc32\winscw\c\sys\install\sisregistry /S /Y > NUL
+if exist \epoc32\winscw\c\sys\install\scr\scr.db del \epoc32\winscw\c\sys\install\scr\scr.db > NUL
+copy .\romdrive\sys\install\scr\provisioned\scr.db \epoc32\winscw\c\sys\install\scr\scr.db /Y > NUL
+if exist \epoc32\winscw\c\sys\install\sisregistry\backup.lst del \epoc32\winscw\c\sys\install\sisregistry\backup.lst > NUL
+if exist \epoc32\winscw\e\sys\install\sisregistry\backup.lst del \epoc32\winscw\e\sys\install\sisregistry\backup.lst > NUL
+if not exist \epoc32\winscw\e\Documents\abc1.txt GOTO LAST
+@rem Cleaning all residue file
+if exist \epoc32\winscw\e\Documents\abc*.txt del \epoc32\winscw\e\Documents\abc*.txt > NUL
+if exist \epoc32\winscw\e\sys\install\sisregistry\80000086\*.reg del \epoc32\winscw\e\sys\install\sisregistry\80000086\*.reg > NUL
+if exist \epoc32\winscw\e\sys\install\sisregistry\80000086\*.ctl del \epoc32\winscw\e\sys\install\sisregistry\80000086\*.ctl > NUL
+if exist \epoc32\winscw\c\sys\install\sisregistry\80000086 rmdir \epoc32\winscw\c\sys\install\sisregistry\80000086 > NUL
+if exist \epoc32\winscw\c\sys\install\sisregistry\80000087 rmdir \epoc32\winscw\c\sys\install\sisregistry\80000087 > NUL
+if exist \epoc32\winscw\e\sys\install\sisregistry\80000086 rmdir \epoc32\winscw\e\sys\install\sisregistry\80000086 > NUL
+if exist \epoc32\winscw\e\sys\install\sisregistry rmdir \epoc32\winscw\e\sys\install\sisregistry > NUL
+if exist \epoc32\winscw\e\sys\install rmdir \epoc32\winscw\e\sys\install > NUL
+if exist \epoc32\winscw\e\sys rmdir \epoc32\winscw\e\sys > NUL
+if exist \epoc32\winscw\e\private\10202dce\*.sis del \epoc32\winscw\e\private\10202dce\*.sis > NUL
+if exist \epoc32\winscw\e\private\10202dce rmdir \epoc32\winscw\e\private\10202dce > NUL
+if exist \epoc32\winscw\e\private rmdir \epoc32\winscw\e\private > NUL
+if exist \epoc32\winscw\e\Documents rmdir \epoc32\winscw\e\Documents > NUL
+if exist \epoc32\winscw\e rmdir \epoc32\winscw\e > NUL
+
+ECHO ***ERRORCODE*** %errorlevel% PASS>>/epoc32/winscw/c/interpretsis_test_harness_db.txt
+GOTO END
+:LAST
+ECHO ***ERRORCODE*** %errorlevel% FAIL>>/epoc32/winscw/c/interpretsis_test_harness_db.txt
+:END
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/secureswitools/swisistools/test/tinterpretsisinteg/parameters_file/int_nr_option_02.txt Mon Mar 15 12:41:05 2010 +0200
@@ -0,0 +1,5 @@
+-z ./romdrive
+-c ./cdrive
+-s /epoc32/winscw/c/tswi/tsis/data/int_nr_option_02.sis +nonremovablepkg
+-w info
+-l /epoc32/winscw/c/interpretsis_test_harness.txt
\ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/secureswitools/swisistools/test/tinterpretsisinteg/parameters_file/int_nr_option_02_db.txt Mon Mar 15 12:41:05 2010 +0200
@@ -0,0 +1,5 @@
+-z ./romdrive
+-c ./cdrive
+-s /epoc32/winscw/c/tswi/tsis/data/int_nr_option_02.sis +nonremovablepkg
+-w info
+-l /epoc32/winscw/c/interpretsis_test_harness_db.txt
\ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/secureswitools/swisistools/test/tinterpretsisinteg/parameters_file/int_nr_option_04.txt Mon Mar 15 12:41:05 2010 +0200
@@ -0,0 +1,1 @@
+appcap2.txt
\ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/secureswitools/swisistools/test/tinterpretsisinteg/parameters_file/int_nr_option_38.txt Mon Mar 15 12:41:05 2010 +0200
@@ -0,0 +1,1 @@
+DRIVE = \epoc32\winscw\e e ext
\ No newline at end of file
--- a/secureswitools/swisistools/test/tinterpretsisinteg/scripts/ini.ini Fri Mar 12 15:43:14 2010 +0200
+++ b/secureswitools/swisistools/test/tinterpretsisinteg/scripts/ini.ini Mon Mar 15 12:41:05 2010 +0200
@@ -432,6 +432,48 @@
exist1=c:\Documents\InstTest\upgrade2.txt
exist2=c:\Documents\InstTest\upgrade3.txt
+[NR-OPTION-01_checkfiles]
+numexist=1
+exist0=c:\Documents\abc1.txt
+
+[NR-OPTION-02_checkfiles]
+numexist=1
+exist0=c:\Documents\abc2.txt
+
+[NR-OPTION-03_checkfiles]
+numexist=3
+exist0=c:\Documents\abc1.txt
+exist1=c:\Documents\abc2.txt
+exist2=c:\Documents\abc3.txt
+
+[NR-OPTION-04_checkfiles]
+numexist=2
+exist0=c:\Documents\abc1.txt
+exist1=c:\Documents\abc2.txt
+
+[NR-OPTION-05_checkfiles]
+numexist=2
+exist0=c:\Documents\abc1.txt
+exist1=c:\Documents\abc3.txt
+
+[NR-OPTION-06_checkfiles]
+numexist=1
+exist0=c:\Documents\abc3.txt
+
+[NR-OPTION-01]
+uid=80000086
+script=c:\tswi\tuiscriptadaptors\scripts\uninstall.xml
+
+[NR-OPTION-02]
+uid=80000087
+script=c:\tswi\tuiscriptadaptors\scripts\uninstall.xml
+
+[NR-OPTION-03]
+uid=80000086
+vendorName=Nokia
+packageName=Interpretsis_NR_option_SP
+script=c:\tswi\tuiscriptadaptors\scripts\uninstall.xml
+
[uSWI002-004-SP]
uid=811111FD
vendorName=Vendor
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/secureswitools/swisistools/test/tinterpretsisinteg/scripts/int_nr_option-01.script Mon Mar 15 12:41:05 2010 +0200
@@ -0,0 +1,36 @@
+// Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of the License "Eclipse Public License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/sfl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+//
+//
+
+// Load Suite
+LOAD_SUITE tuiscriptadaptors
+
+//////////////////////////////////////////////////////////////////////////////////////////////
+//! @SYMTestCaseID INT_NR_Option-01
+//! @SYMTestCaseDesc Install a SIS file with NR CLI option set. This is a positive testcase
+//! @SYMPREQ 405-4255
+//! @SYMTestStatus Released
+//! @SYMTestPriority High
+//! @SYMTestActions Uninstall the installed SIS file
+//! @SYMTestExpectedResults error code -5 returned as SIS file is NR.
+//! @SYMTestType CIT
+//////////////////////////////////////////////////////////////////////////////////////////////
+
+START_TESTCASE INT_NR_Option-01
+
+RUN_TEST_STEP 100 tuiscriptadaptors MmcCheckFilesStep c:\tswi\tinterpretsisinteg\scripts\ini.ini NR-OPTION-01_checkfiles
+RUN_TEST_STEP_RESULT -5 100 tuiscriptadaptors UninstallStep c:\tswi\tinterpretsisinteg\scripts\ini.ini NR-OPTION-01
+
+END_TESTCASE INT_NR_Option-01
\ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/secureswitools/swisistools/test/tinterpretsisinteg/scripts/int_nr_option-02.script Mon Mar 15 12:41:05 2010 +0200
@@ -0,0 +1,36 @@
+// Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of the License "Eclipse Public License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/sfl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+//
+//
+
+// Load Suite
+LOAD_SUITE tuiscriptadaptors
+
+//////////////////////////////////////////////////////////////////////////////////////////////
+//! @SYMTestCaseID INT_NR_Option-02
+//! @SYMTestCaseDesc Install a SIS file with NR CLI option set in parameter file. This is a positive testcase
+//! @SYMPREQ 405-4255
+//! @SYMTestStatus Released
+//! @SYMTestPriority High
+//! @SYMTestActions Uninstall the installed SIS file
+//! @SYMTestExpectedResults error code -5 returned as SIS file is NR.
+//! @SYMTestType CIT
+//////////////////////////////////////////////////////////////////////////////////////////////
+
+START_TESTCASE INT_NR_Option-02
+
+RUN_TEST_STEP 100 tuiscriptadaptors MmcCheckFilesStep c:\tswi\tinterpretsisinteg\scripts\ini.ini NR-OPTION-02_checkfiles
+RUN_TEST_STEP_RESULT -5 100 tuiscriptadaptors UninstallStep c:\tswi\tinterpretsisinteg\scripts\ini.ini NR-OPTION-02
+
+END_TESTCASE INT_NR_Option-02
\ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/secureswitools/swisistools/test/tinterpretsisinteg/scripts/int_nr_option-03.script Mon Mar 15 12:41:05 2010 +0200
@@ -0,0 +1,36 @@
+// Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of the License "Eclipse Public License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/sfl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+//
+//
+
+// Load Suite
+LOAD_SUITE tuiscriptadaptors
+
+//////////////////////////////////////////////////////////////////////////////////////////////
+//! @SYMTestCaseID INT_NR_Option-03
+//! @SYMTestCaseDesc Install a SIS file (SA) without NR CLI option set. then install PU for the same SIS file with NR CLI option set. This is a positive testcase
+//! @SYMPREQ 405-4255
+//! @SYMTestStatus Released
+//! @SYMTestPriority High
+//! @SYMTestActions Uninstall the installed SIS file
+//! @SYMTestExpectedResults error code -5 returned as SIS file is NR.
+//! @SYMTestType CIT
+//////////////////////////////////////////////////////////////////////////////////////////////
+
+START_TESTCASE INT_NR_Option-03
+
+RUN_TEST_STEP 100 tuiscriptadaptors MmcCheckFilesStep c:\tswi\tinterpretsisinteg\scripts\ini.ini NR-OPTION-04_checkfiles
+RUN_TEST_STEP_RESULT -5 100 tuiscriptadaptors UninstallStep c:\tswi\tinterpretsisinteg\scripts\ini.ini NR-OPTION-01
+
+END_TESTCASE INT_NR_Option-03
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/secureswitools/swisistools/test/tinterpretsisinteg/scripts/int_nr_option-05.script Mon Mar 15 12:41:05 2010 +0200
@@ -0,0 +1,36 @@
+// Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of the License "Eclipse Public License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/sfl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+//
+//
+
+// Load Suite
+LOAD_SUITE tuiscriptadaptors
+
+//////////////////////////////////////////////////////////////////////////////////////////////
+//! @SYMTestCaseID INT_NR_Option-05
+//! @SYMTestCaseDesc Install a SIS file without NR CLI option set. This is a positive testcase
+//! @SYMPREQ 405-4255
+//! @SYMTestStatus Released
+//! @SYMTestPriority High
+//! @SYMTestActions Uninstall the installed SIS file
+//! @SYMTestExpectedResults SIS file is uninstalled.
+//! @SYMTestType CIT
+//////////////////////////////////////////////////////////////////////////////////////////////
+
+START_TESTCASE INT_NR_Option-05
+
+RUN_TEST_STEP 100 tuiscriptadaptors MmcCheckFilesStep c:\tswi\tinterpretsisinteg\scripts\ini.ini NR-OPTION-01_checkfiles
+RUN_TEST_STEP 100 tuiscriptadaptors UninstallStep c:\tswi\tinterpretsisinteg\scripts\ini.ini NR-OPTION-01
+
+END_TESTCASE INT_NR_Option-05
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/secureswitools/swisistools/test/tinterpretsisinteg/scripts/int_nr_option-06.script Mon Mar 15 12:41:05 2010 +0200
@@ -0,0 +1,36 @@
+// Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of the License "Eclipse Public License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/sfl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+//
+//
+
+// Load Suite
+LOAD_SUITE tuiscriptadaptors
+
+//////////////////////////////////////////////////////////////////////////////////////////////
+//! @SYMTestCaseID INT_NR_Option-06
+//! @SYMTestCaseDesc SA over SA(NR) This is a positive testcase
+//! @SYMPREQ 405-4255
+//! @SYMTestStatus Released
+//! @SYMTestPriority High
+//! @SYMTestActions Uninstall the installed SIS file
+//! @SYMTestExpectedResults SIS file is uninstalled.
+//! @SYMTestType CIT
+//////////////////////////////////////////////////////////////////////////////////////////////
+
+START_TESTCASE INT_NR_Option-06
+
+RUN_TEST_STEP 100 tuiscriptadaptors MmcCheckFilesStep c:\tswi\tinterpretsisinteg\scripts\ini.ini NR-OPTION-01_checkfiles
+RUN_TEST_STEP 100 tuiscriptadaptors UninstallStep c:\tswi\tinterpretsisinteg\scripts\ini.ini NR-OPTION-01
+
+END_TESTCASE INT_NR_Option-06
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/secureswitools/swisistools/test/tinterpretsisinteg/scripts/int_nr_option-07.script Mon Mar 15 12:41:05 2010 +0200
@@ -0,0 +1,36 @@
+// Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of the License "Eclipse Public License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/sfl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+//
+//
+
+// Load Suite
+LOAD_SUITE tuiscriptadaptors
+
+//////////////////////////////////////////////////////////////////////////////////////////////
+//! @SYMTestCaseID INT_NR_Option-07
+//! @SYMTestCaseDesc SA(NR) over SA(NR) This is a positive testcase
+//! @SYMPREQ 405-4255
+//! @SYMTestStatus Released
+//! @SYMTestPriority High
+//! @SYMTestActions Uninstall the installed SIS file
+//! @SYMTestExpectedResults SIS file is uninstalled.
+//! @SYMTestType CIT
+//////////////////////////////////////////////////////////////////////////////////////////////
+
+START_TESTCASE INT_NR_Option-07
+
+RUN_TEST_STEP 100 tuiscriptadaptors MmcCheckFilesStep c:\tswi\tinterpretsisinteg\scripts\ini.ini NR-OPTION-01_checkfiles
+RUN_TEST_STEP_RESULT -5 100 tuiscriptadaptors UninstallStep c:\tswi\tinterpretsisinteg\scripts\ini.ini NR-OPTION-01
+
+END_TESTCASE INT_NR_Option-07
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/secureswitools/swisistools/test/tinterpretsisinteg/scripts/int_nr_option-08.script Mon Mar 15 12:41:05 2010 +0200
@@ -0,0 +1,36 @@
+// Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of the License "Eclipse Public License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/sfl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+//
+//
+
+// Load Suite
+LOAD_SUITE tuiscriptadaptors
+
+//////////////////////////////////////////////////////////////////////////////////////////////
+//! @SYMTestCaseID INT_NR_Option-08
+//! @SYMTestCaseDesc SP over SA This is a positive testcase
+//! @SYMPREQ 405-4255
+//! @SYMTestStatus Released
+//! @SYMTestPriority High
+//! @SYMTestActions Uninstall the installed SP SIS file
+//! @SYMTestExpectedResults SP SIS file is uninstalled.
+//! @SYMTestType CIT
+//////////////////////////////////////////////////////////////////////////////////////////////
+
+START_TESTCASE INT_NR_Option-08
+
+RUN_TEST_STEP 100 tuiscriptadaptors MmcCheckFilesStep c:\tswi\tinterpretsisinteg\scripts\ini.ini NR-OPTION-05_checkfiles
+RUN_TEST_STEP 100 tuiscriptadaptors UninstallStep c:\tswi\tinterpretsisinteg\scripts\ini.ini NR-OPTION-01
+
+END_TESTCASE INT_NR_Option-08
\ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/secureswitools/swisistools/test/tinterpretsisinteg/scripts/int_nr_option-09.script Mon Mar 15 12:41:05 2010 +0200
@@ -0,0 +1,36 @@
+// Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of the License "Eclipse Public License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/sfl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+//
+//
+
+// Load Suite
+LOAD_SUITE tuiscriptadaptors
+
+//////////////////////////////////////////////////////////////////////////////////////////////
+//! @SYMTestCaseID INT_NR_Option-09
+//! @SYMTestCaseDesc SP over SA(NR) This is a positive testcase
+//! @SYMPREQ 405-4255
+//! @SYMTestStatus Released
+//! @SYMTestPriority High
+//! @SYMTestActions Uninstall the installed SP SIS file
+//! @SYMTestExpectedResults SP SIS file is uninstalled.
+//! @SYMTestType CIT
+//////////////////////////////////////////////////////////////////////////////////////////////
+
+START_TESTCASE INT_NR_Option-09
+
+RUN_TEST_STEP 100 tuiscriptadaptors MmcCheckFilesStep c:\tswi\tinterpretsisinteg\scripts\ini.ini NR-OPTION-05_checkfiles
+RUN_TEST_STEP 100 tuiscriptadaptors UninstallAugStep c:\tswi\tinterpretsisinteg\scripts\ini.ini NR-OPTION-03
+
+END_TESTCASE INT_NR_Option-09
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/secureswitools/swisistools/test/tinterpretsisinteg/scripts/int_nr_option-10.script Mon Mar 15 12:41:05 2010 +0200
@@ -0,0 +1,36 @@
+// Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of the License "Eclipse Public License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/sfl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+//
+//
+
+// Load Suite
+LOAD_SUITE tuiscriptadaptors
+
+//////////////////////////////////////////////////////////////////////////////////////////////
+//! @SYMTestCaseID INT_NR_Option-10
+//! @SYMTestCaseDesc SP (NR) over SA(NR) This is a positive testcase
+//! @SYMPREQ 405-4255
+//! @SYMTestStatus Released
+//! @SYMTestPriority High
+//! @SYMTestActions Uninstall the installed SP SIS file
+//! @SYMTestExpectedResults error code -5 returned.
+//! @SYMTestType CIT
+//////////////////////////////////////////////////////////////////////////////////////////////
+
+START_TESTCASE INT_NR_Option-10
+
+RUN_TEST_STEP 100 tuiscriptadaptors MmcCheckFilesStep c:\tswi\tinterpretsisinteg\scripts\ini.ini NR-OPTION-05_checkfiles
+RUN_TEST_STEP_RESULT -5 100 tuiscriptadaptors UninstallAugStep c:\tswi\tinterpretsisinteg\scripts\ini.ini NR-OPTION-03
+
+END_TESTCASE INT_NR_Option-10
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/secureswitools/swisistools/test/tinterpretsisinteg/scripts/int_nr_option-11.script Mon Mar 15 12:41:05 2010 +0200
@@ -0,0 +1,36 @@
+// Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of the License "Eclipse Public License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/sfl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+//
+//
+
+// Load Suite
+LOAD_SUITE tuiscriptadaptors
+
+//////////////////////////////////////////////////////////////////////////////////////////////
+//! @SYMTestCaseID INT_NR_Option-11
+//! @SYMTestCaseDesc PU over SA. This is a positive testcase
+//! @SYMPREQ 405-4255
+//! @SYMTestStatus Released
+//! @SYMTestPriority High
+//! @SYMTestActions Uninstall the installed SIS file
+//! @SYMTestExpectedResults SIS file is uninstalled
+//! @SYMTestType CIT
+//////////////////////////////////////////////////////////////////////////////////////////////
+
+START_TESTCASE INT_NR_Option-11
+
+RUN_TEST_STEP 100 tuiscriptadaptors MmcCheckFilesStep c:\tswi\tinterpretsisinteg\scripts\ini.ini NR-OPTION-04_checkfiles
+RUN_TEST_STEP 100 tuiscriptadaptors UninstallStep c:\tswi\tinterpretsisinteg\scripts\ini.ini NR-OPTION-01
+
+END_TESTCASE INT_NR_Option-11
\ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/secureswitools/swisistools/test/tinterpretsisinteg/scripts/int_nr_option-12.script Mon Mar 15 12:41:05 2010 +0200
@@ -0,0 +1,35 @@
+// Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of the License "Eclipse Public License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/sfl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+//
+//
+
+// Load Suite
+LOAD_SUITE tuiscriptadaptors
+
+//////////////////////////////////////////////////////////////////////////////////////////////
+//! @SYMTestCaseID INT_NR_Option-12
+//! @SYMTestCaseDesc PU over SA(NR). This is a positive testcase
+//! @SYMPREQ 405-4255
+//! @SYMTestStatus Released
+//! @SYMTestPriority High
+//! @SYMTestActions Uninstall the installed SIS file
+//! @SYMTestExpectedResults SIS file is never installed
+//! @SYMTestType CIT
+//////////////////////////////////////////////////////////////////////////////////////////////
+
+START_TESTCASE INT_NR_Option-12
+
+RUN_TEST_STEP_RESULT -1 100 tuiscriptadaptors UninstallStep c:\tswi\tinterpretsisinteg\scripts\ini.ini NR-OPTION-01
+
+END_TESTCASE INT_NR_Option-12
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/secureswitools/swisistools/test/tinterpretsisinteg/scripts/int_nr_option-13.script Mon Mar 15 12:41:05 2010 +0200
@@ -0,0 +1,36 @@
+// Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of the License "Eclipse Public License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/sfl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+//
+//
+
+// Load Suite
+LOAD_SUITE tuiscriptadaptors
+
+//////////////////////////////////////////////////////////////////////////////////////////////
+//! @SYMTestCaseID INT_NR_Option-13
+//! @SYMTestCaseDesc PU(NR) over SA(NR). This is a positive testcase
+//! @SYMPREQ 405-4255
+//! @SYMTestStatus Released
+//! @SYMTestPriority High
+//! @SYMTestActions Uninstall the installed SIS file
+//! @SYMTestExpectedResults error code -5 returned
+//! @SYMTestType CIT
+//////////////////////////////////////////////////////////////////////////////////////////////
+
+START_TESTCASE INT_NR_Option-13
+
+RUN_TEST_STEP 100 tuiscriptadaptors MmcCheckFilesStep c:\tswi\tinterpretsisinteg\scripts\ini.ini NR-OPTION-04_checkfiles
+RUN_TEST_STEP_RESULT -5 100 tuiscriptadaptors UninstallStep c:\tswi\tinterpretsisinteg\scripts\ini.ini NR-OPTION-01
+
+END_TESTCASE INT_NR_Option-13
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/secureswitools/swisistools/test/tinterpretsisinteg/scripts/int_nr_option-14.script Mon Mar 15 12:41:05 2010 +0200
@@ -0,0 +1,36 @@
+// Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of the License "Eclipse Public License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/sfl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+//
+//
+
+// Load Suite
+LOAD_SUITE tuiscriptadaptors
+
+//////////////////////////////////////////////////////////////////////////////////////////////
+//! @SYMTestCaseID INT_NR_Option-14
+//! @SYMTestCaseDesc SA over SA+SP. This is a positive testcase
+//! @SYMPREQ 405-4255
+//! @SYMTestStatus Released
+//! @SYMTestPriority High
+//! @SYMTestActions Uninstall the installed SIS file
+//! @SYMTestExpectedResults SIS file is uninstalled
+//! @SYMTestType CIT
+//////////////////////////////////////////////////////////////////////////////////////////////
+
+START_TESTCASE INT_NR_Option-14
+
+RUN_TEST_STEP 100 tuiscriptadaptors MmcCheckFilesStep c:\tswi\tinterpretsisinteg\scripts\ini.ini NR-OPTION-01_checkfiles
+RUN_TEST_STEP 100 tuiscriptadaptors UninstallStep c:\tswi\tinterpretsisinteg\scripts\ini.ini NR-OPTION-01
+
+END_TESTCASE INT_NR_Option-14
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/secureswitools/swisistools/test/tinterpretsisinteg/scripts/int_nr_option-15.script Mon Mar 15 12:41:05 2010 +0200
@@ -0,0 +1,36 @@
+// Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of the License "Eclipse Public License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/sfl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+//
+//
+
+// Load Suite
+LOAD_SUITE tuiscriptadaptors
+
+//////////////////////////////////////////////////////////////////////////////////////////////
+//! @SYMTestCaseID INT_NR_Option-15
+//! @SYMTestCaseDesc SA (NR) over SA+SP. This is a positive testcase
+//! @SYMPREQ 405-4255
+//! @SYMTestStatus Released
+//! @SYMTestPriority High
+//! @SYMTestActions Uninstall the installed SIS file
+//! @SYMTestExpectedResults error code -5 returned
+//! @SYMTestType CIT
+//////////////////////////////////////////////////////////////////////////////////////////////
+
+START_TESTCASE INT_NR_Option-15
+
+RUN_TEST_STEP 100 tuiscriptadaptors MmcCheckFilesStep c:\tswi\tinterpretsisinteg\scripts\ini.ini NR-OPTION-01_checkfiles
+RUN_TEST_STEP_RESULT -5 100 tuiscriptadaptors UninstallStep c:\tswi\tinterpretsisinteg\scripts\ini.ini NR-OPTION-01
+
+END_TESTCASE INT_NR_Option-15
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/secureswitools/swisistools/test/tinterpretsisinteg/scripts/int_nr_option-16.script Mon Mar 15 12:41:05 2010 +0200
@@ -0,0 +1,36 @@
+// Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of the License "Eclipse Public License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/sfl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+//
+//
+
+// Load Suite
+LOAD_SUITE tuiscriptadaptors
+
+//////////////////////////////////////////////////////////////////////////////////////////////
+//! @SYMTestCaseID INT_NR_Option-16
+//! @SYMTestCaseDesc SA over SA(NR) + SP. This is a positive testcase
+//! @SYMPREQ 405-4255
+//! @SYMTestStatus Released
+//! @SYMTestPriority High
+//! @SYMTestActions Uninstall the installed SIS file
+//! @SYMTestExpectedResults SIS file uninstalled
+//! @SYMTestType CIT
+//////////////////////////////////////////////////////////////////////////////////////////////
+
+START_TESTCASE INT_NR_Option-16
+
+RUN_TEST_STEP 100 tuiscriptadaptors MmcCheckFilesStep c:\tswi\tinterpretsisinteg\scripts\ini.ini NR-OPTION-01_checkfiles
+RUN_TEST_STEP 100 tuiscriptadaptors UninstallStep c:\tswi\tinterpretsisinteg\scripts\ini.ini NR-OPTION-01
+
+END_TESTCASE INT_NR_Option-16
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/secureswitools/swisistools/test/tinterpretsisinteg/scripts/int_nr_option-17.script Mon Mar 15 12:41:05 2010 +0200
@@ -0,0 +1,36 @@
+// Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of the License "Eclipse Public License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/sfl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+//
+//
+
+// Load Suite
+LOAD_SUITE tuiscriptadaptors
+
+//////////////////////////////////////////////////////////////////////////////////////////////
+//! @SYMTestCaseID INT_NR_Option-17
+//! @SYMTestCaseDesc SA(NR) over SA(NR) + SP. This is a positive testcase
+//! @SYMPREQ 405-4255
+//! @SYMTestStatus Released
+//! @SYMTestPriority High
+//! @SYMTestActions Uninstall the installed SIS file
+//! @SYMTestExpectedResults error code -5 returned
+//! @SYMTestType CIT
+//////////////////////////////////////////////////////////////////////////////////////////////
+
+START_TESTCASE INT_NR_Option-17
+
+RUN_TEST_STEP 100 tuiscriptadaptors MmcCheckFilesStep c:\tswi\tinterpretsisinteg\scripts\ini.ini NR-OPTION-01_checkfiles
+RUN_TEST_STEP_RESULT -5 100 tuiscriptadaptors UninstallStep c:\tswi\tinterpretsisinteg\scripts\ini.ini NR-OPTION-01
+
+END_TESTCASE INT_NR_Option-17
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/secureswitools/swisistools/test/tinterpretsisinteg/scripts/int_nr_option-18.script Mon Mar 15 12:41:05 2010 +0200
@@ -0,0 +1,36 @@
+// Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of the License "Eclipse Public License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/sfl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+//
+//
+
+// Load Suite
+LOAD_SUITE tuiscriptadaptors
+
+//////////////////////////////////////////////////////////////////////////////////////////////
+//! @SYMTestCaseID INT_NR_Option-18
+//! @SYMTestCaseDesc SA over SA(NR) + SP(NR). This is a positive testcase
+//! @SYMPREQ 405-4255
+//! @SYMTestStatus Released
+//! @SYMTestPriority High
+//! @SYMTestActions Uninstall the installed SIS file
+//! @SYMTestExpectedResults SIS file is uninstalled
+//! @SYMTestType CIT
+//////////////////////////////////////////////////////////////////////////////////////////////
+
+START_TESTCASE INT_NR_Option-18
+
+RUN_TEST_STEP 100 tuiscriptadaptors MmcCheckFilesStep c:\tswi\tinterpretsisinteg\scripts\ini.ini NR-OPTION-01_checkfiles
+RUN_TEST_STEP 100 tuiscriptadaptors UninstallStep c:\tswi\tinterpretsisinteg\scripts\ini.ini NR-OPTION-01
+
+END_TESTCASE INT_NR_Option-18
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/secureswitools/swisistools/test/tinterpretsisinteg/scripts/int_nr_option-19.script Mon Mar 15 12:41:05 2010 +0200
@@ -0,0 +1,36 @@
+// Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of the License "Eclipse Public License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/sfl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+//
+//
+
+// Load Suite
+LOAD_SUITE tuiscriptadaptors
+
+//////////////////////////////////////////////////////////////////////////////////////////////
+//! @SYMTestCaseID INT_NR_Option-19
+//! @SYMTestCaseDesc SA(NR) over SA(NR) + SP(NR). This is a positive testcase
+//! @SYMPREQ 405-4255
+//! @SYMTestStatus Released
+//! @SYMTestPriority High
+//! @SYMTestActions Uninstall the installed SIS file
+//! @SYMTestExpectedResults error code -5 returned
+//! @SYMTestType CIT
+//////////////////////////////////////////////////////////////////////////////////////////////
+
+START_TESTCASE INT_NR_Option-19
+
+RUN_TEST_STEP 100 tuiscriptadaptors MmcCheckFilesStep c:\tswi\tinterpretsisinteg\scripts\ini.ini NR-OPTION-01_checkfiles
+RUN_TEST_STEP_RESULT -5 100 tuiscriptadaptors UninstallStep c:\tswi\tinterpretsisinteg\scripts\ini.ini NR-OPTION-01
+
+END_TESTCASE INT_NR_Option-19
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/secureswitools/swisistools/test/tinterpretsisinteg/scripts/int_nr_option-20.script Mon Mar 15 12:41:05 2010 +0200
@@ -0,0 +1,36 @@
+// Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of the License "Eclipse Public License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/sfl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+//
+//
+
+// Load Suite
+LOAD_SUITE tuiscriptadaptors
+
+//////////////////////////////////////////////////////////////////////////////////////////////
+//! @SYMTestCaseID INT_NR_Option-20
+//! @SYMTestCaseDesc SP over SA + SP. This is a positive testcase
+//! @SYMPREQ 405-4255
+//! @SYMTestStatus Released
+//! @SYMTestPriority High
+//! @SYMTestActions Uninstall the installed SIS file
+//! @SYMTestExpectedResults SP in uninstalled
+//! @SYMTestType CIT
+//////////////////////////////////////////////////////////////////////////////////////////////
+
+START_TESTCASE INT_NR_Option-20
+
+RUN_TEST_STEP 100 tuiscriptadaptors MmcCheckFilesStep c:\tswi\tinterpretsisinteg\scripts\ini.ini NR-OPTION-05_checkfiles
+RUN_TEST_STEP 100 tuiscriptadaptors UninstallAugStep c:\tswi\tinterpretsisinteg\scripts\ini.ini NR-OPTION-03
+
+END_TESTCASE INT_NR_Option-20
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/secureswitools/swisistools/test/tinterpretsisinteg/scripts/int_nr_option-21.script Mon Mar 15 12:41:05 2010 +0200
@@ -0,0 +1,36 @@
+// Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of the License "Eclipse Public License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/sfl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+//
+//
+
+// Load Suite
+LOAD_SUITE tuiscriptadaptors
+
+//////////////////////////////////////////////////////////////////////////////////////////////
+//! @SYMTestCaseID INT_NR_Option-21
+//! @SYMTestCaseDesc SP over SA(NR) + SP. This is a positive testcase
+//! @SYMPREQ 405-4255
+//! @SYMTestStatus Released
+//! @SYMTestPriority High
+//! @SYMTestActions Uninstall the installed SIS file
+//! @SYMTestExpectedResults SP in uninstalled
+//! @SYMTestType CIT
+//////////////////////////////////////////////////////////////////////////////////////////////
+
+START_TESTCASE INT_NR_Option-21
+
+RUN_TEST_STEP 100 tuiscriptadaptors MmcCheckFilesStep c:\tswi\tinterpretsisinteg\scripts\ini.ini NR-OPTION-05_checkfiles
+RUN_TEST_STEP 100 tuiscriptadaptors UninstallAugStep c:\tswi\tinterpretsisinteg\scripts\ini.ini NR-OPTION-03
+
+END_TESTCASE INT_NR_Option-21
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/secureswitools/swisistools/test/tinterpretsisinteg/scripts/int_nr_option-22.script Mon Mar 15 12:41:05 2010 +0200
@@ -0,0 +1,36 @@
+// Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of the License "Eclipse Public License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/sfl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+//
+//
+
+// Load Suite
+LOAD_SUITE tuiscriptadaptors
+
+//////////////////////////////////////////////////////////////////////////////////////////////
+//! @SYMTestCaseID INT_NR_Option-22
+//! @SYMTestCaseDesc SP over SA(NR) + SP(NR). This is a positive testcase
+//! @SYMPREQ 405-4255
+//! @SYMTestStatus Released
+//! @SYMTestPriority High
+//! @SYMTestActions Uninstall the installed SIS file
+//! @SYMTestExpectedResults SP in uninstalled
+//! @SYMTestType CIT
+//////////////////////////////////////////////////////////////////////////////////////////////
+
+START_TESTCASE INT_NR_Option-22
+
+RUN_TEST_STEP 100 tuiscriptadaptors MmcCheckFilesStep c:\tswi\tinterpretsisinteg\scripts\ini.ini NR-OPTION-05_checkfiles
+RUN_TEST_STEP 100 tuiscriptadaptors UninstallAugStep c:\tswi\tinterpretsisinteg\scripts\ini.ini NR-OPTION-03
+
+END_TESTCASE INT_NR_Option-22
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/secureswitools/swisistools/test/tinterpretsisinteg/scripts/int_nr_option-23.script Mon Mar 15 12:41:05 2010 +0200
@@ -0,0 +1,35 @@
+// Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of the License "Eclipse Public License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/sfl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+//
+//
+
+// Load Suite
+LOAD_SUITE tuiscriptadaptors
+
+//////////////////////////////////////////////////////////////////////////////////////////////
+//! @SYMTestCaseID INT_NR_Option-23
+//! @SYMTestCaseDesc SP(NR) over SA + SP. This is a positive testcase
+//! @SYMPREQ 405-4255
+//! @SYMTestStatus Released
+//! @SYMTestPriority High
+//! @SYMTestActions Uninstall the installed SIS file
+//! @SYMTestExpectedResults SP(NR) is not installed
+//! @SYMTestType CIT
+//////////////////////////////////////////////////////////////////////////////////////////////
+
+START_TESTCASE INT_NR_Option-23
+
+RUN_TEST_STEP_RESULT -1 100 tuiscriptadaptors UninstallAugStep c:\tswi\tinterpretsisinteg\scripts\ini.ini NR-OPTION-03
+
+END_TESTCASE INT_NR_Option-23
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/secureswitools/swisistools/test/tinterpretsisinteg/scripts/int_nr_option-24.script Mon Mar 15 12:41:05 2010 +0200
@@ -0,0 +1,36 @@
+// Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of the License "Eclipse Public License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/sfl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+//
+//
+
+// Load Suite
+LOAD_SUITE tuiscriptadaptors
+
+//////////////////////////////////////////////////////////////////////////////////////////////
+//! @SYMTestCaseID INT_NR_Option-24
+//! @SYMTestCaseDesc SP(NR) over SA(NR) + SP. This is a positive testcase
+//! @SYMPREQ 405-4255
+//! @SYMTestStatus Released
+//! @SYMTestPriority High
+//! @SYMTestActions Uninstall the installed SIS file
+//! @SYMTestExpectedResults error code -5 returned
+//! @SYMTestType CIT
+//////////////////////////////////////////////////////////////////////////////////////////////
+
+START_TESTCASE INT_NR_Option-24
+
+RUN_TEST_STEP 100 tuiscriptadaptors MmcCheckFilesStep c:\tswi\tinterpretsisinteg\scripts\ini.ini NR-OPTION-05_checkfiles
+RUN_TEST_STEP_RESULT -5 100 tuiscriptadaptors UninstallAugStep c:\tswi\tinterpretsisinteg\scripts\ini.ini NR-OPTION-03
+
+END_TESTCASE INT_NR_Option-24
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/secureswitools/swisistools/test/tinterpretsisinteg/scripts/int_nr_option-25.script Mon Mar 15 12:41:05 2010 +0200
@@ -0,0 +1,36 @@
+// Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of the License "Eclipse Public License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/sfl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+//
+//
+
+// Load Suite
+LOAD_SUITE tuiscriptadaptors
+
+//////////////////////////////////////////////////////////////////////////////////////////////
+//! @SYMTestCaseID INT_NR_Option-25
+//! @SYMTestCaseDesc SP(NR) over SA(NR) + SP(NR). This is a positive testcase
+//! @SYMPREQ 405-4255
+//! @SYMTestStatus Released
+//! @SYMTestPriority High
+//! @SYMTestActions Uninstall the installed SIS file
+//! @SYMTestExpectedResults error code -5 returned
+//! @SYMTestType CIT
+//////////////////////////////////////////////////////////////////////////////////////////////
+
+START_TESTCASE INT_NR_Option-25
+
+RUN_TEST_STEP 100 tuiscriptadaptors MmcCheckFilesStep c:\tswi\tinterpretsisinteg\scripts\ini.ini NR-OPTION-05_checkfiles
+RUN_TEST_STEP_RESULT -5 100 tuiscriptadaptors UninstallAugStep c:\tswi\tinterpretsisinteg\scripts\ini.ini NR-OPTION-03
+
+END_TESTCASE INT_NR_Option-25
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/secureswitools/swisistools/test/tinterpretsisinteg/scripts/int_nr_option-26.script Mon Mar 15 12:41:05 2010 +0200
@@ -0,0 +1,36 @@
+// Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of the License "Eclipse Public License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/sfl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+//
+//
+
+// Load Suite
+LOAD_SUITE tuiscriptadaptors
+
+//////////////////////////////////////////////////////////////////////////////////////////////
+//! @SYMTestCaseID INT_NR_Option-26
+//! @SYMTestCaseDesc PU over SA + SP. This is a positive testcase
+//! @SYMPREQ 405-4255
+//! @SYMTestStatus Released
+//! @SYMTestPriority High
+//! @SYMTestActions Uninstall the installed SIS file
+//! @SYMTestExpectedResults SIS file uninstalled
+//! @SYMTestType CIT
+//////////////////////////////////////////////////////////////////////////////////////////////
+
+START_TESTCASE INT_NR_Option-26
+
+RUN_TEST_STEP 100 tuiscriptadaptors MmcCheckFilesStep c:\tswi\tinterpretsisinteg\scripts\ini.ini NR-OPTION-03_checkfiles
+RUN_TEST_STEP 100 tuiscriptadaptors UninstallStep c:\tswi\tinterpretsisinteg\scripts\ini.ini NR-OPTION-01
+
+END_TESTCASE INT_NR_Option-26
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/secureswitools/swisistools/test/tinterpretsisinteg/scripts/int_nr_option-27.script Mon Mar 15 12:41:05 2010 +0200
@@ -0,0 +1,35 @@
+// Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of the License "Eclipse Public License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/sfl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+//
+//
+
+// Load Suite
+LOAD_SUITE tuiscriptadaptors
+
+//////////////////////////////////////////////////////////////////////////////////////////////
+//! @SYMTestCaseID INT_NR_Option-27
+//! @SYMTestCaseDesc PU over SA(NR) + SP. This is a positive testcase
+//! @SYMPREQ 405-4255
+//! @SYMTestStatus Released
+//! @SYMTestPriority High
+//! @SYMTestActions Uninstall the installed SIS file
+//! @SYMTestExpectedResults SIS file is not installed
+//! @SYMTestType CIT
+//////////////////////////////////////////////////////////////////////////////////////////////
+
+START_TESTCASE INT_NR_Option-27
+
+RUN_TEST_STEP_RESULT -1 100 tuiscriptadaptors UninstallStep c:\tswi\tinterpretsisinteg\scripts\ini.ini NR-OPTION-01
+
+END_TESTCASE INT_NR_Option-27
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/secureswitools/swisistools/test/tinterpretsisinteg/scripts/int_nr_option-28.script Mon Mar 15 12:41:05 2010 +0200
@@ -0,0 +1,35 @@
+// Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of the License "Eclipse Public License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/sfl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+//
+//
+
+// Load Suite
+LOAD_SUITE tuiscriptadaptors
+
+//////////////////////////////////////////////////////////////////////////////////////////////
+//! @SYMTestCaseID INT_NR_Option-28
+//! @SYMTestCaseDesc PU over SA(NR) + SP(NR). This is a positive testcase
+//! @SYMPREQ 405-4255
+//! @SYMTestStatus Released
+//! @SYMTestPriority High
+//! @SYMTestActions Uninstall the installed SIS file
+//! @SYMTestExpectedResults SIS file is not installed
+//! @SYMTestType CIT
+//////////////////////////////////////////////////////////////////////////////////////////////
+
+START_TESTCASE INT_NR_Option-28
+
+RUN_TEST_STEP_RESULT -1 100 tuiscriptadaptors UninstallStep c:\tswi\tinterpretsisinteg\scripts\ini.ini NR-OPTION-01
+
+END_TESTCASE INT_NR_Option-28
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/secureswitools/swisistools/test/tinterpretsisinteg/scripts/int_nr_option-29.script Mon Mar 15 12:41:05 2010 +0200
@@ -0,0 +1,36 @@
+// Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of the License "Eclipse Public License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/sfl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+//
+//
+
+// Load Suite
+LOAD_SUITE tuiscriptadaptors
+
+//////////////////////////////////////////////////////////////////////////////////////////////
+//! @SYMTestCaseID INT_NR_Option-29
+//! @SYMTestCaseDesc PU(NR) over SA + SP. This is a positive testcase
+//! @SYMPREQ 405-4255
+//! @SYMTestStatus Released
+//! @SYMTestPriority High
+//! @SYMTestActions Uninstall the installed SIS file
+//! @SYMTestExpectedResults SIS file is not installed
+//! @SYMTestType CIT
+//////////////////////////////////////////////////////////////////////////////////////////////
+
+START_TESTCASE INT_NR_Option-29
+
+RUN_TEST_STEP 100 tuiscriptadaptors MmcCheckFilesStep c:\tswi\tinterpretsisinteg\scripts\ini.ini NR-OPTION-03_checkfiles
+RUN_TEST_STEP_RESULT -5 100 tuiscriptadaptors UninstallStep c:\tswi\tinterpretsisinteg\scripts\ini.ini NR-OPTION-01
+
+END_TESTCASE INT_NR_Option-29
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/secureswitools/swisistools/test/tinterpretsisinteg/scripts/int_nr_option-30.script Mon Mar 15 12:41:05 2010 +0200
@@ -0,0 +1,36 @@
+// Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of the License "Eclipse Public License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/sfl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+//
+//
+
+// Load Suite
+LOAD_SUITE tuiscriptadaptors
+
+//////////////////////////////////////////////////////////////////////////////////////////////
+//! @SYMTestCaseID INT_NR_Option-30
+//! @SYMTestCaseDesc PU(NR) over SA(NR) + SP. This is a positive testcase
+//! @SYMPREQ 405-4255
+//! @SYMTestStatus Released
+//! @SYMTestPriority High
+//! @SYMTestActions Uninstall the installed SIS file
+//! @SYMTestExpectedResults SIS file is not installed
+//! @SYMTestType CIT
+//////////////////////////////////////////////////////////////////////////////////////////////
+
+START_TESTCASE INT_NR_Option-30
+
+RUN_TEST_STEP 100 tuiscriptadaptors MmcCheckFilesStep c:\tswi\tinterpretsisinteg\scripts\ini.ini NR-OPTION-03_checkfiles
+RUN_TEST_STEP_RESULT -5 100 tuiscriptadaptors UninstallStep c:\tswi\tinterpretsisinteg\scripts\ini.ini NR-OPTION-01
+
+END_TESTCASE INT_NR_Option-30
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/secureswitools/swisistools/test/tinterpretsisinteg/scripts/int_nr_option-31.script Mon Mar 15 12:41:05 2010 +0200
@@ -0,0 +1,36 @@
+// Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of the License "Eclipse Public License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/sfl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+//
+//
+
+// Load Suite
+LOAD_SUITE tuiscriptadaptors
+
+//////////////////////////////////////////////////////////////////////////////////////////////
+//! @SYMTestCaseID INT_NR_Option-31
+//! @SYMTestCaseDesc PU(NR) over SA(NR) + SP(NR). This is a positive testcase
+//! @SYMPREQ 405-4255
+//! @SYMTestStatus Released
+//! @SYMTestPriority High
+//! @SYMTestActions Uninstall the installed SIS file
+//! @SYMTestExpectedResults error code -5 returned
+//! @SYMTestType CIT
+//////////////////////////////////////////////////////////////////////////////////////////////
+
+START_TESTCASE INT_NR_Option-31
+
+RUN_TEST_STEP 100 tuiscriptadaptors MmcCheckFilesStep c:\tswi\tinterpretsisinteg\scripts\ini.ini NR-OPTION-03_checkfiles
+RUN_TEST_STEP_RESULT -5 100 tuiscriptadaptors UninstallStep c:\tswi\tinterpretsisinteg\scripts\ini.ini NR-OPTION-01
+
+END_TESTCASE INT_NR_Option-31
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/secureswitools/swisistools/test/tinterpretsisinteg/scripts/int_nr_option-32.script Mon Mar 15 12:41:05 2010 +0200
@@ -0,0 +1,36 @@
+// Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of the License "Eclipse Public License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/sfl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+//
+//
+
+// Load Suite
+LOAD_SUITE tuiscriptadaptors
+
+//////////////////////////////////////////////////////////////////////////////////////////////
+//! @SYMTestCaseID INT_NR_Option-32
+//! @SYMTestCaseDesc SA over Rom Stub. This is a positive testcase
+//! @SYMPREQ 405-4255
+//! @SYMTestStatus Released
+//! @SYMTestPriority High
+//! @SYMTestActions Uninstall the installed SIS file
+//! @SYMTestExpectedResults SIS file is uninstalled
+//! @SYMTestType CIT
+//////////////////////////////////////////////////////////////////////////////////////////////
+
+START_TESTCASE INT_NR_Option-32
+
+RUN_TEST_STEP 100 tuiscriptadaptors MmcCheckFilesStep c:\tswi\tinterpretsisinteg\scripts\ini.ini NR-OPTION-01_checkfiles
+RUN_TEST_STEP 100 tuiscriptadaptors UninstallStep c:\tswi\tinterpretsisinteg\scripts\ini.ini NR-OPTION-01
+
+END_TESTCASE INT_NR_Option-32
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/secureswitools/swisistools/test/tinterpretsisinteg/scripts/int_nr_option-33.script Mon Mar 15 12:41:05 2010 +0200
@@ -0,0 +1,36 @@
+// Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of the License "Eclipse Public License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/sfl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+//
+//
+
+// Load Suite
+LOAD_SUITE tuiscriptadaptors
+
+//////////////////////////////////////////////////////////////////////////////////////////////
+//! @SYMTestCaseID INT_NR_Option-33
+//! @SYMTestCaseDesc SA(NR) over Rom Stub. This is a positive testcase
+//! @SYMPREQ 405-4255
+//! @SYMTestStatus Released
+//! @SYMTestPriority High
+//! @SYMTestActions Uninstall the installed SIS file
+//! @SYMTestExpectedResults error code -5 returned
+//! @SYMTestType CIT
+//////////////////////////////////////////////////////////////////////////////////////////////
+
+START_TESTCASE INT_NR_Option-33
+
+RUN_TEST_STEP 100 tuiscriptadaptors MmcCheckFilesStep c:\tswi\tinterpretsisinteg\scripts\ini.ini NR-OPTION-01_checkfiles
+RUN_TEST_STEP_RESULT -5 100 tuiscriptadaptors UninstallStep c:\tswi\tinterpretsisinteg\scripts\ini.ini NR-OPTION-01
+
+END_TESTCASE INT_NR_Option-33
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/secureswitools/swisistools/test/tinterpretsisinteg/scripts/int_nr_option-34.script Mon Mar 15 12:41:05 2010 +0200
@@ -0,0 +1,36 @@
+// Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of the License "Eclipse Public License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/sfl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+//
+//
+
+// Load Suite
+LOAD_SUITE tuiscriptadaptors
+
+//////////////////////////////////////////////////////////////////////////////////////////////
+//! @SYMTestCaseID INT_NR_Option-34
+//! @SYMTestCaseDesc SP over Rom Stub. This is a positive testcase
+//! @SYMPREQ 405-4255
+//! @SYMTestStatus Released
+//! @SYMTestPriority High
+//! @SYMTestActions Uninstall the installed SIS file
+//! @SYMTestExpectedResults SIS file is installed
+//! @SYMTestType CIT
+//////////////////////////////////////////////////////////////////////////////////////////////
+
+START_TESTCASE INT_NR_Option-34
+
+RUN_TEST_STEP 100 tuiscriptadaptors MmcCheckFilesStep c:\tswi\tinterpretsisinteg\scripts\ini.ini NR-OPTION-06_checkfiles
+RUN_TEST_STEP 100 tuiscriptadaptors UninstallAugStep c:\tswi\tinterpretsisinteg\scripts\ini.ini NR-OPTION-03
+
+END_TESTCASE INT_NR_Option-34
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/secureswitools/swisistools/test/tinterpretsisinteg/scripts/int_nr_option-35.script Mon Mar 15 12:41:05 2010 +0200
@@ -0,0 +1,36 @@
+// Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of the License "Eclipse Public License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/sfl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+//
+//
+
+// Load Suite
+LOAD_SUITE tuiscriptadaptors
+
+//////////////////////////////////////////////////////////////////////////////////////////////
+//! @SYMTestCaseID INT_NR_Option-35
+//! @SYMTestCaseDesc SP(NR) over Rom Stub. This is a positive testcase
+//! @SYMPREQ 405-4255
+//! @SYMTestStatus Released
+//! @SYMTestPriority High
+//! @SYMTestActions Uninstall the installed SIS file
+//! @SYMTestExpectedResults error code -5 returned
+//! @SYMTestType CIT
+//////////////////////////////////////////////////////////////////////////////////////////////
+
+START_TESTCASE INT_NR_Option-35
+
+RUN_TEST_STEP 100 tuiscriptadaptors MmcCheckFilesStep c:\tswi\tinterpretsisinteg\scripts\ini.ini NR-OPTION-06_checkfiles
+RUN_TEST_STEP_RESULT -5 100 tuiscriptadaptors UninstallAugStep c:\tswi\tinterpretsisinteg\scripts\ini.ini NR-OPTION-03
+
+END_TESTCASE INT_NR_Option-35
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/secureswitools/swisistools/test/tinterpretsisinteg/scripts/int_nr_option-36.script Mon Mar 15 12:41:05 2010 +0200
@@ -0,0 +1,36 @@
+// Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of the License "Eclipse Public License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/sfl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+//
+//
+
+// Load Suite
+LOAD_SUITE tuiscriptadaptors
+
+//////////////////////////////////////////////////////////////////////////////////////////////
+//! @SYMTestCaseID INT_NR_Option-36
+//! @SYMTestCaseDesc PU over Rom Stub. This is a positive testcase
+//! @SYMPREQ 405-4255
+//! @SYMTestStatus Released
+//! @SYMTestPriority High
+//! @SYMTestActions Uninstall the installed SIS file
+//! @SYMTestExpectedResults error code -5 returned
+//! @SYMTestType CIT
+//////////////////////////////////////////////////////////////////////////////////////////////
+
+START_TESTCASE INT_NR_Option-36
+
+RUN_TEST_STEP 100 tuiscriptadaptors MmcCheckFilesStep c:\tswi\tinterpretsisinteg\scripts\ini.ini NR-OPTION-02_checkfiles
+RUN_TEST_STEP_RESULT -5 100 tuiscriptadaptors UninstallStep c:\tswi\tinterpretsisinteg\scripts\ini.ini NR-OPTION-01
+
+END_TESTCASE INT_NR_Option-36
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/secureswitools/swisistools/test/tinterpretsisinteg/scripts/int_nr_option-37.script Mon Mar 15 12:41:05 2010 +0200
@@ -0,0 +1,36 @@
+// Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of the License "Eclipse Public License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/sfl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+//
+//
+
+// Load Suite
+LOAD_SUITE tuiscriptadaptors
+
+//////////////////////////////////////////////////////////////////////////////////////////////
+//! @SYMTestCaseID INT_NR_Option-37
+//! @SYMTestCaseDesc PU(NR) over Rom Stub. This is a positive testcase
+//! @SYMPREQ 405-4255
+//! @SYMTestStatus Released
+//! @SYMTestPriority High
+//! @SYMTestActions Uninstall the installed SIS file
+//! @SYMTestExpectedResults error code -5 returned
+//! @SYMTestType CIT
+//////////////////////////////////////////////////////////////////////////////////////////////
+
+START_TESTCASE INT_NR_Option-37
+
+RUN_TEST_STEP 100 tuiscriptadaptors MmcCheckFilesStep c:\tswi\tinterpretsisinteg\scripts\ini.ini NR-OPTION-02_checkfiles
+RUN_TEST_STEP_RESULT -5 100 tuiscriptadaptors UninstallStep c:\tswi\tinterpretsisinteg\scripts\ini.ini NR-OPTION-01
+
+END_TESTCASE INT_NR_Option-37
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/secureswitools/swisistools/test/tinterpretsisinteg/scripts/int_nr_option-38.script Mon Mar 15 12:41:05 2010 +0200
@@ -0,0 +1,35 @@
+// Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of the License "Eclipse Public License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/sfl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+//
+//
+
+// Load Suite
+LOAD_SUITE tuiscriptadaptors
+
+//////////////////////////////////////////////////////////////////////////////////////////////
+//! @SYMTestCaseID INT_NR_Option-38
+//! @SYMTestCaseDesc Install a SIS file with NR CLI option and +mcard option set.
+//! @SYMPREQ 405-4255
+//! @SYMTestStatus Released
+//! @SYMTestPriority High
+//! @SYMTestActions Uninstall the installed SIS file
+//! @SYMTestExpectedResults error code -5 returned as SIS file is NR.
+//! @SYMTestType CIT
+//////////////////////////////////////////////////////////////////////////////////////////////
+
+START_TESTCASE INT_NR_Option-38
+
+RUN_TEST_STEP_RESULT -5 100 tuiscriptadaptors UninstallStep c:\tswi\tinterpretsisinteg\scripts\ini.ini NR-OPTION-01
+
+END_TESTCASE INT_NR_Option-38
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/secureswitools/swisistools/test/tinterpretsisinteg/scripts/int_nr_option-39.script Mon Mar 15 12:41:05 2010 +0200
@@ -0,0 +1,35 @@
+// Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of the License "Eclipse Public License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/sfl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+//
+//
+
+// Load Suite
+LOAD_SUITE tuiscriptadaptors
+
+//////////////////////////////////////////////////////////////////////////////////////////////
+//! @SYMTestCaseID INT_NR_Option-39
+//! @SYMTestCaseDesc Install a SIS file with NR CLI option and +mcardalone option set.
+//! @SYMPREQ 405-4255
+//! @SYMTestStatus Released
+//! @SYMTestPriority High
+//! @SYMTestActions Uninstall the installed SIS file
+//! @SYMTestExpectedResults error code -5 returned as SIS file is NR.
+//! @SYMTestType CIT
+//////////////////////////////////////////////////////////////////////////////////////////////
+
+START_TESTCASE INT_NR_Option-39
+
+RUN_TEST_STEP_RESULT -1 100 tuiscriptadaptors UninstallStep c:\tswi\tinterpretsisinteg\scripts\ini.ini NR-OPTION-01
+
+END_TESTCASE INT_NR_Option-39
--- a/secureswitools/swisistools/test/tinterpretsisinteg/scripts/tintsisi003.script Fri Mar 12 15:43:14 2010 +0200
+++ b/secureswitools/swisistools/test/tinterpretsisinteg/scripts/tintsisi003.script Mon Mar 15 12:41:05 2010 +0200
@@ -41,20 +41,23 @@
//! @SYMTestType CIT
//////////////////////////////////////////////////////////////////////////////////////////////
+//Backup code in SWI is modified to return error for NR packages. So restore is also not possible.
+
+
START_TESTCASE API-SEC-SWI-INTERPRETSIS-I003-0001
RUN_TEST_STEP 100 tbackuprestore PRESENT c:\tswi\tinterpretsisinteg\scripts\ini.ini I003A
-RUN_TEST_STEP 100 tbackuprestore BACKUP c:\tswi\tinterpretsisinteg\scripts\ini.ini I003A
+RUN_TEST_STEP_RESULT -5 100 tbackuprestore BACKUP c:\tswi\tinterpretsisinteg\scripts\ini.ini I003A
RUN_TEST_STEP 100 tbackuprestore PRESENT c:\tswi\tinterpretsisinteg\scripts\ini.ini I003A
-RUN_TEST_STEP 100 tuiscriptadaptors ForceRemove c:\tswi\tinterpretsisinteg\scripts\ini.ini I003removeregistrysisfile
+//RUN_TEST_STEP 100 tuiscriptadaptors ForceRemove c:\tswi\tinterpretsisinteg\scripts\ini.ini I003removeregistrysisfile
//DELAY is given so that the backup.ctl file will be created in this time
-DELAY 5000
-RUN_TEST_STEP 100 tbackuprestore ABSENT c:\tswi\tinterpretsisinteg\scripts\ini.ini I003A
+//DELAY 5000
+//RUN_TEST_STEP 100 tbackuprestore ABSENT c:\tswi\tinterpretsisinteg\scripts\ini.ini I003A
-RUN_TEST_STEP 100 tbackuprestore RESTORE c:\tswi\tinterpretsisinteg\scripts\ini.ini I003A
-RUN_TEST_STEP 100 tbackuprestore PRESENT c:\tswi\tinterpretsisinteg\scripts\ini.ini I003A
+//RUN_TEST_STEP 100 tbackuprestore RESTORE c:\tswi\tinterpretsisinteg\scripts\ini.ini I003A
+//RUN_TEST_STEP 100 tbackuprestore PRESENT c:\tswi\tinterpretsisinteg\scripts\ini.ini I003A
//RUN_TEST_STEP 100 tuiscriptadaptors ForceRemove c:\tswi\tinterpretsisinteg\scripts\ini.ini I003removeregistrysisfile
//DELAY 5000
Binary file secureswitools/swisistools/test/tinterpretsisinteg/testdataf006/privatefolderdef.pkg has changed
Binary file secureswitools/swisistools/test/tinterpretsisinteg/testdatainc124436/inc124436.pkg has changed
--- a/secureswitools/swisistools/test/tinterpretsisinteg/testlist.xml Fri Mar 12 15:43:14 2010 +0200
+++ b/secureswitools/swisistools/test/tinterpretsisinteg/testlist.xml Mon Mar 15 12:41:05 2010 +0200
@@ -1625,5 +1625,238 @@
<check type="program" name="perl \epoc32\winscw\c\tswi\tinterpretsisinteg\check.pl">API-INST-PREQ2525-InterpretSIS-19 preq2525-interpretsis-19.txt 1 "positive" "none"</check>
</test>
+<test id="INT_NR_Option-01" type="nativeonly">
+ <title>INT_NR_Option-01</title>
+ <command log="no">\epoc32\winscw\c\tswi\tinterpretsisinteg\int_nr_option-01.bat INT_NR_Option-01</command>
+ <check type="program" name="perl \epoc32\winscw\c\tswi\tinterpretsisinteg\swicheck.pl">INT_NR_Option-01 INT_NR_Option-01 3 "positive" "both" "nouid" "nobatchfile" "int_nr_option-01.script" "int_nr_option-01.htm" "FAIL = 0" "FAIL = 0" </check>
+ </test>
+
+<test id="INT_NR_Option-02" type="nativeonly">
+ <title>INT_NR_Option-02</title>
+ <command log="no">\epoc32\winscw\c\tswi\tinterpretsisinteg\int_nr_option-02.bat INT_NR_Option-02</command>
+ <check type="program" name="perl \epoc32\winscw\c\tswi\tinterpretsisinteg\swicheck.pl">INT_NR_Option-02 INT_NR_Option-02 3 "positive" "both" "nouid" "nobatchfile" "int_nr_option-02.script" "int_nr_option-02.htm" "FAIL = 0" "FAIL = 0" </check>
+ </test>
+
+<test id="INT_NR_Option-03" type="nativeonly">
+ <title>INT_NR_Option-03</title>
+ <command log="no">\epoc32\winscw\c\tswi\tinterpretsisinteg\int_nr_option-03.bat INT_NR_Option-01</command>
+ <check type="program" name="perl \epoc32\winscw\c\tswi\tinterpretsisinteg\swicheck.pl">INT_NR_Option-03 INT_NR_Option-03 3 "positive" "both" "nouid" "nobatchfile" "int_nr_option-03.script" "int_nr_option-03.htm" "FAIL = 0" "FAIL = 0" </check>
+ </test>
+
+<test id="INT_NR_Option-04" type="nativeonly">
+ <title>INT_NR_Option-04</title>
+ <command log="no">\epoc32\winscw\c\tswi\tinterpretsisinteg\int_nr_option-04.bat INT_NR_Option-04</command>
+ <check type="program" name="perl \epoc32\winscw\c\tswi\tinterpretsisinteg\check.pl">INT_NR_Option-04 int_nr_option_04.txt 1 "negative" "none"</check>
+ </test>
+
+<test id="INT_NR_Option-05" type="nativeonly">
+ <title>INT_NR_Option-05</title>
+ <command log="no">\epoc32\winscw\c\tswi\tinterpretsisinteg\int_nr_option-05.bat INT_NR_Option-05</command>
+ <check type="program" name="perl \epoc32\winscw\c\tswi\tinterpretsisinteg\swicheck.pl">INT_NR_Option-05 INT_NR_Option-05 3 "positive" "both" "nouid" "nobatchfile" "int_nr_option-05.script" "int_nr_option-05.htm" "FAIL = 0" "FAIL = 0" </check>
+ </test>
+
+<test id="INT_NR_Option-06" type="nativeonly">
+ <title>INT_NR_Option-06</title>
+ <command log="no">\epoc32\winscw\c\tswi\tinterpretsisinteg\int_nr_option-06.bat INT_NR_Option-06</command>
+ <check type="program" name="perl \epoc32\winscw\c\tswi\tinterpretsisinteg\swicheck.pl">INT_NR_Option-06 INT_NR_Option-06 3 "positive" "both" "nouid" "nobatchfile" "int_nr_option-06.script" "int_nr_option-06.htm" "FAIL = 0" "FAIL = 0" </check>
+ </test>
+
+<test id="INT_NR_Option-07" type="nativeonly">
+ <title>INT_NR_Option-07</title>
+ <command log="no">\epoc32\winscw\c\tswi\tinterpretsisinteg\int_nr_option-07.bat INT_NR_Option-07</command>
+ <check type="program" name="perl \epoc32\winscw\c\tswi\tinterpretsisinteg\swicheck.pl">INT_NR_Option-07 INT_NR_Option-07 3 "positive" "both" "nouid" "nobatchfile" "int_nr_option-07.script" "int_nr_option-07.htm" "FAIL = 0" "FAIL = 0" </check>
+ </test>
+<test id="INT_NR_Option-08" type="nativeonly">
+ <title>INT_NR_Option-08</title>
+ <command log="no">\epoc32\winscw\c\tswi\tinterpretsisinteg\int_nr_option-08.bat INT_NR_Option-08</command>
+ <check type="program" name="perl \epoc32\winscw\c\tswi\tinterpretsisinteg\swicheck.pl">INT_NR_Option-08 INT_NR_Option-08 3 "positive" "both" "nouid" "nobatchfile" "int_nr_option-08.script" "int_nr_option-08.htm" "FAIL = 0" "FAIL = 0" </check>
+ </test>
+
+<test id="INT_NR_Option-09" type="nativeonly">
+ <title>INT_NR_Option-09</title>
+ <command log="no">\epoc32\winscw\c\tswi\tinterpretsisinteg\int_nr_option-09.bat INT_NR_Option-09</command>
+ <check type="program" name="perl \epoc32\winscw\c\tswi\tinterpretsisinteg\swicheck.pl">INT_NR_Option-09 INT_NR_Option-09 3 "positive" "both" "nouid" "nobatchfile" "int_nr_option-09.script" "int_nr_option-09.htm" "FAIL = 0" "FAIL = 0" </check>
+ </test>
+
+<test id="INT_NR_Option-10" type="nativeonly">
+ <title>INT_NR_Option-10</title>
+ <command log="no">\epoc32\winscw\c\tswi\tinterpretsisinteg\int_nr_option-10.bat INT_NR_Option-10</command>
+ <check type="program" name="perl \epoc32\winscw\c\tswi\tinterpretsisinteg\swicheck.pl">INT_NR_Option-10 INT_NR_Option-10 3 "positive" "both" "nouid" "nobatchfile" "int_nr_option-10.script" "int_nr_option-10.htm" "FAIL = 0" "FAIL = 0" </check>
+ </test>
+
+<test id="INT_NR_Option-11" type="nativeonly">
+ <title>INT_NR_Option-11</title>
+ <command log="no">\epoc32\winscw\c\tswi\tinterpretsisinteg\int_nr_option-11.bat INT_NR_Option-11</command>
+ <check type="program" name="perl \epoc32\winscw\c\tswi\tinterpretsisinteg\swicheck.pl">INT_NR_Option-11 INT_NR_Option-11 3 "positive" "both" "nouid" "nobatchfile" "int_nr_option-11.script" "int_nr_option-11.htm" "FAIL = 0" "FAIL = 0" </check>
+ </test>
+
+<test id="INT_NR_Option-12" type="nativeonly">
+ <title>INT_NR_Option-12</title>
+ <command log="no">\epoc32\winscw\c\tswi\tinterpretsisinteg\int_nr_option-12.bat INT_NR_Option-12</command>
+ <check type="program" name="perl \epoc32\winscw\c\tswi\tinterpretsisinteg\swicheck.pl">INT_NR_Option-12 INT_NR_Option-12 3 "positive" "both" "nouid" "nobatchfile" "int_nr_option-12.script" "int_nr_option-12.htm" "FAIL = 0" "FAIL = 0" </check>
+ </test>
+
+<test id="INT_NR_Option-13" type="nativeonly">
+ <title>INT_NR_Option-13</title>
+ <command log="no">\epoc32\winscw\c\tswi\tinterpretsisinteg\int_nr_option-13.bat INT_NR_Option-13</command>
+ <check type="program" name="perl \epoc32\winscw\c\tswi\tinterpretsisinteg\swicheck.pl">INT_NR_Option-13 INT_NR_Option-13 3 "positive" "both" "nouid" "nobatchfile" "int_nr_option-13.script" "int_nr_option-13.htm" "FAIL = 0" "FAIL = 0" </check>
+ </test>
+
+<test id="INT_NR_Option-14" type="nativeonly">
+ <title>INT_NR_Option-14</title>
+ <command log="no">\epoc32\winscw\c\tswi\tinterpretsisinteg\int_nr_option-14.bat INT_NR_Option-14</command>
+ <check type="program" name="perl \epoc32\winscw\c\tswi\tinterpretsisinteg\swicheck.pl">INT_NR_Option-14 INT_NR_Option-14 3 "positive" "both" "nouid" "nobatchfile" "int_nr_option-14.script" "int_nr_option-14.htm" "FAIL = 0" "FAIL = 0" </check>
+ </test>
+
+<test id="INT_NR_Option-15" type="nativeonly">
+ <title>INT_NR_Option-15</title>
+ <command log="no">\epoc32\winscw\c\tswi\tinterpretsisinteg\int_nr_option-15.bat INT_NR_Option-15</command>
+ <check type="program" name="perl \epoc32\winscw\c\tswi\tinterpretsisinteg\swicheck.pl">INT_NR_Option-15 INT_NR_Option-15 3 "positive" "both" "nouid" "nobatchfile" "int_nr_option-15.script" "int_nr_option-15.htm" "FAIL = 0" "FAIL = 0" </check>
+ </test>
+
+<test id="INT_NR_Option-16" type="nativeonly">
+ <title>INT_NR_Option-16</title>
+ <command log="no">\epoc32\winscw\c\tswi\tinterpretsisinteg\int_nr_option-16.bat INT_NR_Option-16</command>
+ <check type="program" name="perl \epoc32\winscw\c\tswi\tinterpretsisinteg\swicheck.pl">INT_NR_Option-16 INT_NR_Option-16 3 "positive" "both" "nouid" "nobatchfile" "int_nr_option-16.script" "int_nr_option-16.htm" "FAIL = 0" "FAIL = 0" </check>
+ </test>
+
+<test id="INT_NR_Option-17" type="nativeonly">
+ <title>INT_NR_Option-17</title>
+ <command log="no">\epoc32\winscw\c\tswi\tinterpretsisinteg\int_nr_option-17.bat INT_NR_Option-17</command>
+ <check type="program" name="perl \epoc32\winscw\c\tswi\tinterpretsisinteg\swicheck.pl">INT_NR_Option-17 INT_NR_Option-17 3 "positive" "both" "nouid" "nobatchfile" "int_nr_option-17.script" "int_nr_option-17.htm" "FAIL = 0" "FAIL = 0" </check>
+ </test>
+
+<test id="INT_NR_Option-18" type="nativeonly">
+ <title>INT_NR_Option-18</title>
+ <command log="no">\epoc32\winscw\c\tswi\tinterpretsisinteg\int_nr_option-18.bat INT_NR_Option-18</command>
+ <check type="program" name="perl \epoc32\winscw\c\tswi\tinterpretsisinteg\swicheck.pl">INT_NR_Option-18 INT_NR_Option-18 3 "positive" "both" "nouid" "nobatchfile" "int_nr_option-18.script" "int_nr_option-18.htm" "FAIL = 0" "FAIL = 0" </check>
+ </test>
+
+<test id="INT_NR_Option-19" type="nativeonly">
+ <title>INT_NR_Option-19</title>
+ <command log="no">\epoc32\winscw\c\tswi\tinterpretsisinteg\int_nr_option-19.bat INT_NR_Option-19</command>
+ <check type="program" name="perl \epoc32\winscw\c\tswi\tinterpretsisinteg\swicheck.pl">INT_NR_Option-19 INT_NR_Option-19 3 "positive" "both" "nouid" "nobatchfile" "int_nr_option-19.script" "int_nr_option-19.htm" "FAIL = 0" "FAIL = 0" </check>
+ </test>
+
+<test id="INT_NR_Option-20" type="nativeonly">
+ <title>INT_NR_Option-20</title>
+ <command log="no">\epoc32\winscw\c\tswi\tinterpretsisinteg\int_nr_option-20.bat INT_NR_Option-20</command>
+ <check type="program" name="perl \epoc32\winscw\c\tswi\tinterpretsisinteg\swicheck.pl">INT_NR_Option-20 INT_NR_Option-20 3 "positive" "both" "nouid" "nobatchfile" "int_nr_option-20.script" "int_nr_option-20.htm" "FAIL = 0" "FAIL = 0" </check>
+ </test>
+
+<test id="INT_NR_Option-21" type="nativeonly">
+ <title>INT_NR_Option-21</title>
+ <command log="no">\epoc32\winscw\c\tswi\tinterpretsisinteg\int_nr_option-21.bat INT_NR_Option-21</command>
+ <check type="program" name="perl \epoc32\winscw\c\tswi\tinterpretsisinteg\swicheck.pl">INT_NR_Option-21 INT_NR_Option-21 3 "positive" "both" "nouid" "nobatchfile" "int_nr_option-21.script" "int_nr_option-21.htm" "FAIL = 0" "FAIL = 0" </check>
+ </test>
+
+<test id="INT_NR_Option-22" type="nativeonly">
+ <title>INT_NR_Option-22</title>
+ <command log="no">\epoc32\winscw\c\tswi\tinterpretsisinteg\int_nr_option-22.bat INT_NR_Option-22</command>
+ <check type="program" name="perl \epoc32\winscw\c\tswi\tinterpretsisinteg\swicheck.pl">INT_NR_Option-22 INT_NR_Option-22 3 "positive" "both" "nouid" "nobatchfile" "int_nr_option-22.script" "int_nr_option-22.htm" "FAIL = 0" "FAIL = 0" </check>
+ </test>
+
+<test id="INT_NR_Option-23" type="nativeonly">
+ <title>INT_NR_Option-23</title>
+ <command log="no">\epoc32\winscw\c\tswi\tinterpretsisinteg\int_nr_option-23.bat INT_NR_Option-23</command>
+ <check type="program" name="perl \epoc32\winscw\c\tswi\tinterpretsisinteg\swicheck.pl">INT_NR_Option-23 INT_NR_Option-23 3 "positive" "both" "nouid" "nobatchfile" "int_nr_option-23.script" "int_nr_option-23.htm" "FAIL = 0" "FAIL = 0" </check>
+ </test>
+
+<test id="INT_NR_Option-24" type="nativeonly">
+ <title>INT_NR_Option-24</title>
+ <command log="no">\epoc32\winscw\c\tswi\tinterpretsisinteg\int_nr_option-24.bat INT_NR_Option-24</command>
+ <check type="program" name="perl \epoc32\winscw\c\tswi\tinterpretsisinteg\swicheck.pl">INT_NR_Option-24 INT_NR_Option-24 3 "positive" "both" "nouid" "nobatchfile" "int_nr_option-24.script" "int_nr_option-24.htm" "FAIL = 0" "FAIL = 0" </check>
+ </test>
+
+<test id="INT_NR_Option-25" type="nativeonly">
+ <title>INT_NR_Option-25</title>
+ <command log="no">\epoc32\winscw\c\tswi\tinterpretsisinteg\int_nr_option-25.bat INT_NR_Option-25</command>
+ <check type="program" name="perl \epoc32\winscw\c\tswi\tinterpretsisinteg\swicheck.pl">INT_NR_Option-25 INT_NR_Option-25 3 "positive" "both" "nouid" "nobatchfile" "int_nr_option-25.script" "int_nr_option-25.htm" "FAIL = 0" "FAIL = 0" </check>
+ </test>
+
+<test id="INT_NR_Option-26" type="nativeonly">
+ <title>INT_NR_Option-26</title>
+ <command log="no">\epoc32\winscw\c\tswi\tinterpretsisinteg\int_nr_option-26.bat INT_NR_Option-26</command>
+ <check type="program" name="perl \epoc32\winscw\c\tswi\tinterpretsisinteg\swicheck.pl">INT_NR_Option-26 INT_NR_Option-26 3 "positive" "both" "nouid" "nobatchfile" "int_nr_option-26.script" "int_nr_option-26.htm" "FAIL = 0" "FAIL = 0" </check>
+ </test>
+
+<test id="INT_NR_Option-27" type="nativeonly">
+ <title>INT_NR_Option-27</title>
+ <command log="no">\epoc32\winscw\c\tswi\tinterpretsisinteg\int_nr_option-27.bat INT_NR_Option-27</command>
+ <check type="program" name="perl \epoc32\winscw\c\tswi\tinterpretsisinteg\swicheck.pl">INT_NR_Option-27 INT_NR_Option-27 3 "positive" "both" "nouid" "nobatchfile" "int_nr_option-27.script" "int_nr_option-27.htm" "FAIL = 0" "FAIL = 0" </check>
+ </test>
+
+<test id="INT_NR_Option-28" type="nativeonly">
+ <title>INT_NR_Option-28</title>
+ <command log="no">\epoc32\winscw\c\tswi\tinterpretsisinteg\int_nr_option-28.bat INT_NR_Option-28</command>
+ <check type="program" name="perl \epoc32\winscw\c\tswi\tinterpretsisinteg\swicheck.pl">INT_NR_Option-28 INT_NR_Option-28 3 "positive" "both" "nouid" "nobatchfile" "int_nr_option-28.script" "int_nr_option-28.htm" "FAIL = 0" "FAIL = 0" </check>
+ </test>
+
+<test id="INT_NR_Option-29" type="nativeonly">
+ <title>INT_NR_Option-29</title>
+ <command log="no">\epoc32\winscw\c\tswi\tinterpretsisinteg\int_nr_option-29.bat INT_NR_Option-29</command>
+ <check type="program" name="perl \epoc32\winscw\c\tswi\tinterpretsisinteg\swicheck.pl">INT_NR_Option-29 INT_NR_Option-29 3 "positive" "both" "nouid" "nobatchfile" "int_nr_option-29.script" "int_nr_option-29.htm" "FAIL = 0" "FAIL = 0" </check>
+ </test>
+
+<test id="INT_NR_Option-30" type="nativeonly">
+ <title>INT_NR_Option-30</title>
+ <command log="no">\epoc32\winscw\c\tswi\tinterpretsisinteg\int_nr_option-30.bat INT_NR_Option-30</command>
+ <check type="program" name="perl \epoc32\winscw\c\tswi\tinterpretsisinteg\swicheck.pl">INT_NR_Option-30 INT_NR_Option-30 3 "positive" "both" "nouid" "nobatchfile" "int_nr_option-30.script" "int_nr_option-30.htm" "FAIL = 0" "FAIL = 0" </check>
+ </test>
+
+<test id="INT_NR_Option-31" type="nativeonly">
+ <title>INT_NR_Option-31</title>
+ <command log="no">\epoc32\winscw\c\tswi\tinterpretsisinteg\int_nr_option-31.bat INT_NR_Option-31</command>
+ <check type="program" name="perl \epoc32\winscw\c\tswi\tinterpretsisinteg\swicheck.pl">INT_NR_Option-31 INT_NR_Option-31 3 "positive" "both" "nouid" "nobatchfile" "int_nr_option-31.script" "int_nr_option-31.htm" "FAIL = 0" "FAIL = 0" </check>
+ </test>
+
+<test id="INT_NR_Option-32" type="nativeonly">
+ <title>INT_NR_Option-32</title>
+ <command log="no">\epoc32\winscw\c\tswi\tinterpretsisinteg\int_nr_option-32.bat INT_NR_Option-32</command>
+ <check type="program" name="perl \epoc32\winscw\c\tswi\tinterpretsisinteg\swicheck.pl">INT_NR_Option-32 INT_NR_Option-32 3 "positive" "both" "nouid" "nobatchfile" "int_nr_option-32.script" "int_nr_option-32.htm" "FAIL = 0" "FAIL = 0" </check>
+ </test>
+
+<test id="INT_NR_Option-33" type="nativeonly">
+ <title>INT_NR_Option-33</title>
+ <command log="no">\epoc32\winscw\c\tswi\tinterpretsisinteg\int_nr_option-33.bat INT_NR_Option-33</command>
+ <check type="program" name="perl \epoc32\winscw\c\tswi\tinterpretsisinteg\swicheck.pl">INT_NR_Option-33 INT_NR_Option-33 3 "positive" "both" "nouid" "nobatchfile" "int_nr_option-33.script" "int_nr_option-33.htm" "FAIL = 0" "FAIL = 0" </check>
+ </test>
+
+<test id="INT_NR_Option-34" type="nativeonly">
+ <title>INT_NR_Option-34</title>
+ <command log="no">\epoc32\winscw\c\tswi\tinterpretsisinteg\int_nr_option-34.bat INT_NR_Option-34</command>
+ <check type="program" name="perl \epoc32\winscw\c\tswi\tinterpretsisinteg\swicheck.pl">INT_NR_Option-34 INT_NR_Option-34 3 "positive" "both" "nouid" "nobatchfile" "int_nr_option-34.script" "int_nr_option-34.htm" "FAIL = 0" "FAIL = 0" </check>
+ </test>
+
+<test id="INT_NR_Option-35" type="nativeonly">
+ <title>INT_NR_Option-35</title>
+ <command log="no">\epoc32\winscw\c\tswi\tinterpretsisinteg\int_nr_option-35.bat INT_NR_Option-35</command>
+ <check type="program" name="perl \epoc32\winscw\c\tswi\tinterpretsisinteg\swicheck.pl">INT_NR_Option-35 INT_NR_Option-35 3 "positive" "both" "nouid" "nobatchfile" "int_nr_option-35.script" "int_nr_option-35.htm" "FAIL = 0" "FAIL = 0" </check>
+ </test>
+
+<test id="INT_NR_Option-36" type="nativeonly">
+ <title>INT_NR_Option-36</title>
+ <command log="no">\epoc32\winscw\c\tswi\tinterpretsisinteg\int_nr_option-36.bat INT_NR_Option-36</command>
+ <check type="program" name="perl \epoc32\winscw\c\tswi\tinterpretsisinteg\swicheck.pl">INT_NR_Option-36 INT_NR_Option-36 3 "positive" "both" "nouid" "nobatchfile" "int_nr_option-36.script" "int_nr_option-36.htm" "FAIL = 0" "FAIL = 0" </check>
+ </test>
+
+<test id="INT_NR_Option-37" type="nativeonly">
+ <title>INT_NR_Option-37</title>
+ <command log="no">\epoc32\winscw\c\tswi\tinterpretsisinteg\int_nr_option-37.bat INT_NR_Option-37</command>
+ <check type="program" name="perl \epoc32\winscw\c\tswi\tinterpretsisinteg\swicheck.pl">INT_NR_Option-37 INT_NR_Option-37 3 "positive" "both" "nouid" "nobatchfile" "int_nr_option-37.script" "int_nr_option-37.htm" "FAIL = 0" "FAIL = 0" </check>
+ </test>
+
+<test id="INT_NR_Option-38" type="nativeonly">
+ <title>INT_NR_Option-38</title>
+ <command log="no">\epoc32\winscw\c\tswi\tinterpretsisinteg\int_nr_option-38.bat INT_NR_Option-38</command>
+ <check type="program" name="perl \epoc32\winscw\c\tswi\tinterpretsisinteg\swicheck.pl">INT_NR_Option-38 INT_NR_Option-38 3 "positive" "both" "nouid" "nobatchfile" "int_nr_option-38.script" "int_nr_option-38.htm" "FAIL = 0" "FAIL = 0" </check>
+ </test>
+
+<test id="INT_NR_Option-39" type="nativeonly">
+ <title>INT_NR_Option-39</title>
+ <command log="no">\epoc32\winscw\c\tswi\tinterpretsisinteg\int_nr_option-39.bat INT_NR_Option-39</command>
+ <check type="program" name="perl \epoc32\winscw\c\tswi\tinterpretsisinteg\swicheck.pl">INT_NR_Option-39 INT_NR_Option-39 3 "positive" "both" "nouid" "nobatchfile" "int_nr_option-39.script" "int_nr_option-39.htm" "FAIL = 0" "FAIL = 0" </check>
+ </test>
+
</testlist>
--- a/secureswitools/swisistools/test/tinterpretsisinteg/testlistdb.xml Fri Mar 12 15:43:14 2010 +0200
+++ b/secureswitools/swisistools/test/tinterpretsisinteg/testlistdb.xml Mon Mar 15 12:41:05 2010 +0200
@@ -1649,10 +1649,244 @@
<check type="program" name="perl \epoc32\winscw\c\tswi\tinterpretsisinteg\swicheck.pl">api-inst-preq2525-interpretsis-18 API-INST-PREQ2525-InterpretSIS-18 3 "positive" "both" "nouid" "nobatchfile" "API-INST-PREQ2525-InterpretSIS-18.script" "api-inst-preq2525-interpretsis-18.htm" "FAIL = 0" "FAIL = 0" </check>
</test>
- <test id="API-INST-PREQ2525-InterpretSIS-19">
+<test id="API-INST-PREQ2525-InterpretSIS-19">
<title>API-INST-PREQ2525-InterpretSIS-19 Install sis having negative language id in supported_language block</title>
<command log="no">\epoc32\winscw\c\tswi\tinterpretsisinteg\api-inst-preq2525-interpretsis-19_db.bat API-INST-PREQ2525-InterpretSIS-19</command>
<check type="program" name="perl \epoc32\winscw\c\tswi\tinterpretsisinteg\check.pl">API-INST-PREQ2525-InterpretSIS-19 preq2525-interpretsis-19.txt 1 "positive" "none"</check>
</test>
+<test id="INT_NR_Option-01">
+ <title>INT_NR_Option-01</title>
+ <command log="no">\epoc32\winscw\c\tswi\tinterpretsisinteg\int_nr_option-01_db.bat INT_NR_Option-01</command>
+ <check type="program" name="perl \epoc32\winscw\c\tswi\tinterpretsisinteg\swicheck.pl">INT_NR_Option-01 INT_NR_Option-01 3 "positive" "both" "nouid" "nobatchfile" "int_nr_option-01.script" "int_nr_option-01.htm" "FAIL = 0" "FAIL = 0" </check>
+ </test>
+
+<test id="INT_NR_Option-02">
+ <title>INT_NR_Option-02</title>
+ <command log="no">\epoc32\winscw\c\tswi\tinterpretsisinteg\int_nr_option-02_db.bat INT_NR_Option-02</command>
+ <check type="program" name="perl \epoc32\winscw\c\tswi\tinterpretsisinteg\swicheck.pl">INT_NR_Option-02 INT_NR_Option-02 3 "positive" "both" "nouid" "nobatchfile" "int_nr_option-02.script" "int_nr_option-02.htm" "FAIL = 0" "FAIL = 0" </check>
+ </test>
+
+<test id="INT_NR_Option-03">
+ <title>INT_NR_Option-03</title>
+ <command log="no">\epoc32\winscw\c\tswi\tinterpretsisinteg\int_nr_option-03_db.bat INT_NR_Option-01</command>
+ <check type="program" name="perl \epoc32\winscw\c\tswi\tinterpretsisinteg\swicheck.pl">INT_NR_Option-03 INT_NR_Option-03 3 "positive" "both" "nouid" "nobatchfile" "int_nr_option-03.script" "int_nr_option-03.htm" "FAIL = 0" "FAIL = 0" </check>
+ </test>
+
+<test id="INT_NR_Option-04">
+ <title>INT_NR_Option-04</title>
+ <command log="no">\epoc32\winscw\c\tswi\tinterpretsisinteg\int_nr_option-04_db.bat INT_NR_Option-04</command>
+ <check type="program" name="perl \epoc32\winscw\c\tswi\tinterpretsisinteg\check.pl">INT_NR_Option-04 int_nr_option_04.txt 1 "negative" "none"</check>
+ </test>
+
+<test id="INT_NR_Option-05">
+ <title>INT_NR_Option-05</title>
+ <command log="no">\epoc32\winscw\c\tswi\tinterpretsisinteg\int_nr_option-05_db.bat INT_NR_Option-05</command>
+ <check type="program" name="perl \epoc32\winscw\c\tswi\tinterpretsisinteg\swicheck.pl">INT_NR_Option-05 INT_NR_Option-05 3 "positive" "both" "nouid" "nobatchfile" "int_nr_option-05.script" "int_nr_option-05.htm" "FAIL = 0" "FAIL = 0" </check>
+ </test>
+
+<test id="INT_NR_Option-06">
+ <title>INT_NR_Option-06</title>
+ <command log="no">\epoc32\winscw\c\tswi\tinterpretsisinteg\int_nr_option-06_db.bat INT_NR_Option-06</command>
+ <check type="program" name="perl \epoc32\winscw\c\tswi\tinterpretsisinteg\swicheck.pl">INT_NR_Option-06 INT_NR_Option-06 3 "positive" "both" "nouid" "nobatchfile" "int_nr_option-06.script" "int_nr_option-06.htm" "FAIL = 0" "FAIL = 0" </check>
+ </test>
+
+<test id="INT_NR_Option-07">
+ <title>INT_NR_Option-07</title>
+ <command log="no">\epoc32\winscw\c\tswi\tinterpretsisinteg\int_nr_option-07_db.bat INT_NR_Option-07</command>
+ <check type="program" name="perl \epoc32\winscw\c\tswi\tinterpretsisinteg\swicheck.pl">INT_NR_Option-07 INT_NR_Option-07 3 "positive" "both" "nouid" "nobatchfile" "int_nr_option-07.script" "int_nr_option-07.htm" "FAIL = 0" "FAIL = 0" </check>
+ </test>
+
+<test id="INT_NR_Option-08">
+ <title>INT_NR_Option-08</title>
+ <command log="no">\epoc32\winscw\c\tswi\tinterpretsisinteg\int_nr_option-08_db.bat INT_NR_Option-08</command>
+ <check type="program" name="perl \epoc32\winscw\c\tswi\tinterpretsisinteg\swicheck.pl">INT_NR_Option-08 INT_NR_Option-08 3 "positive" "both" "nouid" "nobatchfile" "int_nr_option-08.script" "int_nr_option-08.htm" "FAIL = 0" "FAIL = 0" </check>
+ </test>
+
+<test id="INT_NR_Option-09">
+ <title>INT_NR_Option-09</title>
+ <command log="no">\epoc32\winscw\c\tswi\tinterpretsisinteg\int_nr_option-09_db.bat INT_NR_Option-09</command>
+ <check type="program" name="perl \epoc32\winscw\c\tswi\tinterpretsisinteg\swicheck.pl">INT_NR_Option-09 INT_NR_Option-09 3 "positive" "both" "nouid" "nobatchfile" "int_nr_option-09.script" "int_nr_option-09.htm" "FAIL = 0" "FAIL = 0" </check>
+ </test>
+
+<test id="INT_NR_Option-10">
+ <title>INT_NR_Option-10</title>
+ <command log="no">\epoc32\winscw\c\tswi\tinterpretsisinteg\int_nr_option-10_db.bat INT_NR_Option-10</command>
+ <check type="program" name="perl \epoc32\winscw\c\tswi\tinterpretsisinteg\swicheck.pl">INT_NR_Option-10 INT_NR_Option-10 3 "positive" "both" "nouid" "nobatchfile" "int_nr_option-10.script" "int_nr_option-10.htm" "FAIL = 0" "FAIL = 0" </check>
+ </test>
+
+<test id="INT_NR_Option-11">
+ <title>INT_NR_Option-11</title>
+ <command log="no">\epoc32\winscw\c\tswi\tinterpretsisinteg\int_nr_option-11_db.bat INT_NR_Option-11</command>
+ <check type="program" name="perl \epoc32\winscw\c\tswi\tinterpretsisinteg\swicheck.pl">INT_NR_Option-11 INT_NR_Option-11 3 "positive" "both" "nouid" "nobatchfile" "int_nr_option-11.script" "int_nr_option-11.htm" "FAIL = 0" "FAIL = 0" </check>
+ </test>
+
+<test id="INT_NR_Option-12">
+ <title>INT_NR_Option-12</title>
+ <command log="no">\epoc32\winscw\c\tswi\tinterpretsisinteg\int_nr_option-12_db.bat INT_NR_Option-12</command>
+ <check type="program" name="perl \epoc32\winscw\c\tswi\tinterpretsisinteg\swicheck.pl">INT_NR_Option-12 INT_NR_Option-12 3 "positive" "both" "nouid" "nobatchfile" "int_nr_option-12.script" "int_nr_option-12.htm" "FAIL = 0" "FAIL = 0" </check>
+ </test>
+
+<test id="INT_NR_Option-13">
+ <title>INT_NR_Option-13</title>
+ <command log="no">\epoc32\winscw\c\tswi\tinterpretsisinteg\int_nr_option-13_db.bat INT_NR_Option-13</command>
+ <check type="program" name="perl \epoc32\winscw\c\tswi\tinterpretsisinteg\swicheck.pl">INT_NR_Option-13 INT_NR_Option-13 3 "positive" "both" "nouid" "nobatchfile" "int_nr_option-13.script" "int_nr_option-13.htm" "FAIL = 0" "FAIL = 0" </check>
+ </test>
+
+<test id="INT_NR_Option-14">
+ <title>INT_NR_Option-14</title>
+ <command log="no">\epoc32\winscw\c\tswi\tinterpretsisinteg\int_nr_option-14_db.bat INT_NR_Option-14</command>
+ <check type="program" name="perl \epoc32\winscw\c\tswi\tinterpretsisinteg\swicheck.pl">INT_NR_Option-14 INT_NR_Option-14 3 "positive" "both" "nouid" "nobatchfile" "int_nr_option-14.script" "int_nr_option-14.htm" "FAIL = 0" "FAIL = 0" </check>
+ </test>
+
+<test id="INT_NR_Option-15">
+ <title>INT_NR_Option-15</title>
+ <command log="no">\epoc32\winscw\c\tswi\tinterpretsisinteg\int_nr_option-15_db.bat INT_NR_Option-15</command>
+ <check type="program" name="perl \epoc32\winscw\c\tswi\tinterpretsisinteg\swicheck.pl">INT_NR_Option-15 INT_NR_Option-15 3 "positive" "both" "nouid" "nobatchfile" "int_nr_option-15.script" "int_nr_option-15.htm" "FAIL = 0" "FAIL = 0" </check>
+ </test>
+
+<test id="INT_NR_Option-16">
+ <title>INT_NR_Option-16</title>
+ <command log="no">\epoc32\winscw\c\tswi\tinterpretsisinteg\int_nr_option-16_db.bat INT_NR_Option-16</command>
+ <check type="program" name="perl \epoc32\winscw\c\tswi\tinterpretsisinteg\swicheck.pl">INT_NR_Option-16 INT_NR_Option-16 3 "positive" "both" "nouid" "nobatchfile" "int_nr_option-16.script" "int_nr_option-16.htm" "FAIL = 0" "FAIL = 0" </check>
+ </test>
+
+<test id="INT_NR_Option-17">
+ <title>INT_NR_Option-17</title>
+ <command log="no">\epoc32\winscw\c\tswi\tinterpretsisinteg\int_nr_option-17_db.bat INT_NR_Option-17</command>
+ <check type="program" name="perl \epoc32\winscw\c\tswi\tinterpretsisinteg\swicheck.pl">INT_NR_Option-17 INT_NR_Option-17 3 "positive" "both" "nouid" "nobatchfile" "int_nr_option-17.script" "int_nr_option-17.htm" "FAIL = 0" "FAIL = 0" </check>
+ </test>
+
+<test id="INT_NR_Option-18">
+ <title>INT_NR_Option-18</title>
+ <command log="no">\epoc32\winscw\c\tswi\tinterpretsisinteg\int_nr_option-18_db.bat INT_NR_Option-18</command>
+ <check type="program" name="perl \epoc32\winscw\c\tswi\tinterpretsisinteg\swicheck.pl">INT_NR_Option-18 INT_NR_Option-18 3 "positive" "both" "nouid" "nobatchfile" "int_nr_option-18.script" "int_nr_option-18.htm" "FAIL = 0" "FAIL = 0" </check>
+ </test>
+
+<test id="INT_NR_Option-19">
+ <title>INT_NR_Option-19</title>
+ <command log="no">\epoc32\winscw\c\tswi\tinterpretsisinteg\int_nr_option-19_db.bat INT_NR_Option-19</command>
+ <check type="program" name="perl \epoc32\winscw\c\tswi\tinterpretsisinteg\swicheck.pl">INT_NR_Option-19 INT_NR_Option-19 3 "positive" "both" "nouid" "nobatchfile" "int_nr_option-19.script" "int_nr_option-19.htm" "FAIL = 0" "FAIL = 0" </check>
+ </test>
+
+<test id="INT_NR_Option-20">
+ <title>INT_NR_Option-20</title>
+ <command log="no">\epoc32\winscw\c\tswi\tinterpretsisinteg\int_nr_option-20_db.bat INT_NR_Option-20</command>
+ <check type="program" name="perl \epoc32\winscw\c\tswi\tinterpretsisinteg\swicheck.pl">INT_NR_Option-20 INT_NR_Option-20 3 "positive" "both" "nouid" "nobatchfile" "int_nr_option-20.script" "int_nr_option-20.htm" "FAIL = 0" "FAIL = 0" </check>
+ </test>
+
+<test id="INT_NR_Option-21">
+ <title>INT_NR_Option-21</title>
+ <command log="no">\epoc32\winscw\c\tswi\tinterpretsisinteg\int_nr_option-21_db.bat INT_NR_Option-21</command>
+ <check type="program" name="perl \epoc32\winscw\c\tswi\tinterpretsisinteg\swicheck.pl">INT_NR_Option-21 INT_NR_Option-21 3 "positive" "both" "nouid" "nobatchfile" "int_nr_option-21.script" "int_nr_option-21.htm" "FAIL = 0" "FAIL = 0" </check>
+ </test>
+
+<test id="INT_NR_Option-22">
+ <title>INT_NR_Option-22</title>
+ <command log="no">\epoc32\winscw\c\tswi\tinterpretsisinteg\int_nr_option-22_db.bat INT_NR_Option-22</command>
+ <check type="program" name="perl \epoc32\winscw\c\tswi\tinterpretsisinteg\swicheck.pl">INT_NR_Option-22 INT_NR_Option-22 3 "positive" "both" "nouid" "nobatchfile" "int_nr_option-22.script" "int_nr_option-22.htm" "FAIL = 0" "FAIL = 0" </check>
+ </test>
+
+<test id="INT_NR_Option-23">
+ <title>INT_NR_Option-23</title>
+ <command log="no">\epoc32\winscw\c\tswi\tinterpretsisinteg\int_nr_option-23_db.bat INT_NR_Option-23</command>
+ <check type="program" name="perl \epoc32\winscw\c\tswi\tinterpretsisinteg\swicheck.pl">INT_NR_Option-23 INT_NR_Option-23 3 "positive" "both" "nouid" "nobatchfile" "int_nr_option-23.script" "int_nr_option-23.htm" "FAIL = 0" "FAIL = 0" </check>
+ </test>
+
+<test id="INT_NR_Option-24">
+ <title>INT_NR_Option-24</title>
+ <command log="no">\epoc32\winscw\c\tswi\tinterpretsisinteg\int_nr_option-24_db.bat INT_NR_Option-24</command>
+ <check type="program" name="perl \epoc32\winscw\c\tswi\tinterpretsisinteg\swicheck.pl">INT_NR_Option-24 INT_NR_Option-24 3 "positive" "both" "nouid" "nobatchfile" "int_nr_option-24.script" "int_nr_option-24.htm" "FAIL = 0" "FAIL = 0" </check>
+ </test>
+
+<test id="INT_NR_Option-25">
+ <title>INT_NR_Option-25</title>
+ <command log="no">\epoc32\winscw\c\tswi\tinterpretsisinteg\int_nr_option-25_db.bat INT_NR_Option-25</command>
+ <check type="program" name="perl \epoc32\winscw\c\tswi\tinterpretsisinteg\swicheck.pl">INT_NR_Option-25 INT_NR_Option-25 3 "positive" "both" "nouid" "nobatchfile" "int_nr_option-25.script" "int_nr_option-25.htm" "FAIL = 0" "FAIL = 0" </check>
+ </test>
+
+<test id="INT_NR_Option-26">
+ <title>INT_NR_Option-26</title>
+ <command log="no">\epoc32\winscw\c\tswi\tinterpretsisinteg\int_nr_option-26_db.bat INT_NR_Option-26</command>
+ <check type="program" name="perl \epoc32\winscw\c\tswi\tinterpretsisinteg\swicheck.pl">INT_NR_Option-26 INT_NR_Option-26 3 "positive" "both" "nouid" "nobatchfile" "int_nr_option-26.script" "int_nr_option-26.htm" "FAIL = 0" "FAIL = 0" </check>
+ </test>
+
+<test id="INT_NR_Option-27">
+ <title>INT_NR_Option-27</title>
+ <command log="no">\epoc32\winscw\c\tswi\tinterpretsisinteg\int_nr_option-27_db.bat INT_NR_Option-27</command>
+ <check type="program" name="perl \epoc32\winscw\c\tswi\tinterpretsisinteg\swicheck.pl">INT_NR_Option-27 INT_NR_Option-27 3 "positive" "both" "nouid" "nobatchfile" "int_nr_option-27.script" "int_nr_option-27.htm" "FAIL = 0" "FAIL = 0" </check>
+ </test>
+
+<test id="INT_NR_Option-28">
+ <title>INT_NR_Option-28</title>
+ <command log="no">\epoc32\winscw\c\tswi\tinterpretsisinteg\int_nr_option-28_db.bat INT_NR_Option-28</command>
+ <check type="program" name="perl \epoc32\winscw\c\tswi\tinterpretsisinteg\swicheck.pl">INT_NR_Option-28 INT_NR_Option-28 3 "positive" "both" "nouid" "nobatchfile" "int_nr_option-28.script" "int_nr_option-28.htm" "FAIL = 0" "FAIL = 0" </check>
+ </test>
+
+<test id="INT_NR_Option-29">
+ <title>INT_NR_Option-29</title>
+ <command log="no">\epoc32\winscw\c\tswi\tinterpretsisinteg\int_nr_option-29_db.bat INT_NR_Option-29</command>
+ <check type="program" name="perl \epoc32\winscw\c\tswi\tinterpretsisinteg\swicheck.pl">INT_NR_Option-29 INT_NR_Option-29 3 "positive" "both" "nouid" "nobatchfile" "int_nr_option-29.script" "int_nr_option-29.htm" "FAIL = 0" "FAIL = 0" </check>
+ </test>
+
+<test id="INT_NR_Option-30">
+ <title>INT_NR_Option-30</title>
+ <command log="no">\epoc32\winscw\c\tswi\tinterpretsisinteg\int_nr_option-30_db.bat INT_NR_Option-30</command>
+ <check type="program" name="perl \epoc32\winscw\c\tswi\tinterpretsisinteg\swicheck.pl">INT_NR_Option-30 INT_NR_Option-30 3 "positive" "both" "nouid" "nobatchfile" "int_nr_option-30.script" "int_nr_option-30.htm" "FAIL = 0" "FAIL = 0" </check>
+ </test>
+
+<test id="INT_NR_Option-31">
+ <title>INT_NR_Option-31</title>
+ <command log="no">\epoc32\winscw\c\tswi\tinterpretsisinteg\int_nr_option-31_db.bat INT_NR_Option-31</command>
+ <check type="program" name="perl \epoc32\winscw\c\tswi\tinterpretsisinteg\swicheck.pl">INT_NR_Option-31 INT_NR_Option-31 3 "positive" "both" "nouid" "nobatchfile" "int_nr_option-31.script" "int_nr_option-31.htm" "FAIL = 0" "FAIL = 0" </check>
+ </test>
+
+<test id="INT_NR_Option-32">
+ <title>INT_NR_Option-32</title>
+ <command log="no">\epoc32\winscw\c\tswi\tinterpretsisinteg\int_nr_option-32_db.bat INT_NR_Option-32</command>
+ <check type="program" name="perl \epoc32\winscw\c\tswi\tinterpretsisinteg\swicheck.pl">INT_NR_Option-32 INT_NR_Option-32 3 "positive" "both" "nouid" "nobatchfile" "int_nr_option-32.script" "int_nr_option-32.htm" "FAIL = 0" "FAIL = 0" </check>
+ </test>
+
+<test id="INT_NR_Option-33">
+ <title>INT_NR_Option-33</title>
+ <command log="no">\epoc32\winscw\c\tswi\tinterpretsisinteg\int_nr_option-33_db.bat INT_NR_Option-33</command>
+ <check type="program" name="perl \epoc32\winscw\c\tswi\tinterpretsisinteg\swicheck.pl">INT_NR_Option-33 INT_NR_Option-33 3 "positive" "both" "nouid" "nobatchfile" "int_nr_option-33.script" "int_nr_option-33.htm" "FAIL = 0" "FAIL = 0" </check>
+ </test>
+
+<test id="INT_NR_Option-34">
+ <title>INT_NR_Option-34</title>
+ <command log="no">\epoc32\winscw\c\tswi\tinterpretsisinteg\int_nr_option-34_db.bat INT_NR_Option-34</command>
+ <check type="program" name="perl \epoc32\winscw\c\tswi\tinterpretsisinteg\swicheck.pl">INT_NR_Option-34 INT_NR_Option-34 3 "positive" "both" "nouid" "nobatchfile" "int_nr_option-34.script" "int_nr_option-34.htm" "FAIL = 0" "FAIL = 0" </check>
+ </test>
+
+<test id="INT_NR_Option-35">
+ <title>INT_NR_Option-35</title>
+ <command log="no">\epoc32\winscw\c\tswi\tinterpretsisinteg\int_nr_option-35_db.bat INT_NR_Option-35</command>
+ <check type="program" name="perl \epoc32\winscw\c\tswi\tinterpretsisinteg\swicheck.pl">INT_NR_Option-35 INT_NR_Option-35 3 "positive" "both" "nouid" "nobatchfile" "int_nr_option-35.script" "int_nr_option-35.htm" "FAIL = 0" "FAIL = 0" </check>
+ </test>
+
+<test id="INT_NR_Option-36">
+ <title>INT_NR_Option-36</title>
+ <command log="no">\epoc32\winscw\c\tswi\tinterpretsisinteg\int_nr_option-36_db.bat INT_NR_Option-36</command>
+ <check type="program" name="perl \epoc32\winscw\c\tswi\tinterpretsisinteg\swicheck.pl">INT_NR_Option-36 INT_NR_Option-36 3 "positive" "both" "nouid" "nobatchfile" "int_nr_option-36.script" "int_nr_option-36.htm" "FAIL = 0" "FAIL = 0" </check>
+ </test>
+
+<test id="INT_NR_Option-37">
+ <title>INT_NR_Option-37</title>
+ <command log="no">\epoc32\winscw\c\tswi\tinterpretsisinteg\int_nr_option-37_db.bat INT_NR_Option-37</command>
+ <check type="program" name="perl \epoc32\winscw\c\tswi\tinterpretsisinteg\swicheck.pl">INT_NR_Option-37 INT_NR_Option-37 3 "positive" "both" "nouid" "nobatchfile" "int_nr_option-37.script" "int_nr_option-37.htm" "FAIL = 0" "FAIL = 0" </check>
+ </test>
+
+<test id="INT_NR_Option-38">
+ <title>INT_NR_Option-38</title>
+ <command log="no">\epoc32\winscw\c\tswi\tinterpretsisinteg\int_nr_option-38_db.bat INT_NR_Option-38</command>
+ <check type="program" name="perl \epoc32\winscw\c\tswi\tinterpretsisinteg\swicheck.pl">INT_NR_Option-38 INT_NR_Option-38 3 "positive" "both" "nouid" "nobatchfile" "int_nr_option-38.script" "int_nr_option-38.htm" "FAIL = 0" "FAIL = 0" </check>
+ </test>
+
+<test id="INT_NR_Option-39">
+ <title>INT_NR_Option-39</title>
+ <command log="no">\epoc32\winscw\c\tswi\tinterpretsisinteg\int_nr_option-39_db.bat INT_NR_Option-39</command>
+ <check type="program" name="perl \epoc32\winscw\c\tswi\tinterpretsisinteg\swicheck.pl">INT_NR_Option-39 INT_NR_Option-39 3 "positive" "both" "nouid" "nobatchfile" "int_nr_option-39.script" "int_nr_option-39.htm" "FAIL = 0" "FAIL = 0" </check>
+ </test>
+
</testlist>