--- a/cryptomgmtlibs/securitytestfw/test/autotesting/testsecurity_sdp.bat	Tue Jul 21 01:04:32 2009 +0100
+++ b/cryptomgmtlibs/securitytestfw/test/autotesting/testsecurity_sdp.bat	Thu Sep 10 14:01:51 2009 +0300
@@ -1,61 +1,59 @@
-@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/epl-v10.html".
-@rem
-@rem Initial Contributors:
-@rem Nokia Corporation - initial contribution.
-@rem
-@rem Contributors:
-@rem
-@rem Description: 
-@rem
-REM Run security tests on hardware
-REM
-REM This should run the same tests as test_spec_cedar, minus OOM and
-REM cancellation testing.
-
-REM Attempt to stop the execution in case it's accidentally started on a PC
-ECHO About to run Security Team Hardware Tests
-pause
-
-REM create testresults directory
-md c:\testresults
-md e:\testresults
-copy z:\buildid.txt e:\
-copy z:\buildid.txt e:\testresults
-
-REM copy hosts file to redirect cam-ocspserver request to ban-ocspserver
-md c:\private
-md c:\private\10000882
-copy z:\hosts c:\private\10000882\hosts
-
-REM install automated commdb
-copy z:\auto.cfg c:\auto.cfg
-ced -i c:\auto.cfg
-
-sntpclient -savings cbtime01.symbian.intra bantime01.symbian.intra
-
-runcrypto.bat
-
-runcaftests.bat
-
-REM Enable the following test when DEF076875(or relevant CR) is done.
-REM runtlsclientauth.bat
-
-REM Temporary solution for ROM overflow issues (DEF109635)
-runpkcs12tests.bat
-
-runcertman.bat
-
-runasnpkcs.bat
-
-runfiletokens.bat
-
-runcryptotokens.bat
-
-REM run only if available
-//runupstests.bat
+@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/epl-v10.html".
+@rem
+@rem Initial Contributors:
+@rem Nokia Corporation - initial contribution.
+@rem
+@rem Contributors:
+@rem
+@rem Description: 
+@rem
+
+REM Attempt to stop the execution in case it's accidentally started on a PC
+ECHO About to run Security Team Hardware Tests
+pause
+
+REM create testresults directory
+md c:\testresults
+md e:\testresults
+copy z:\buildid.txt e:\
+copy z:\buildid.txt e:\testresults
+
+REM copy hosts file to redirect cam-ocspserver request to ban-ocspserver
+md c:\private
+md c:\private\10000882
+copy z:\hosts c:\private\10000882\hosts
+
+REM install automated commdb
+copy z:\auto.cfg c:\auto.cfg
+ced -i c:\auto.cfg
+
+sntpclient -savings cbtime01.symbian.intra bantime01.symbian.intra
+
+runcaftests.bat
+
+runcrypto.bat
+
+REM Run recognizer tests
+md c:\trecog
+copy /s z:\trecog\* c:\trecog
+
+testexecute z:\trecog\trecogcert.script
+move c:\logs\testexecute\trecogcert.htm e:\testresults\trecogcert.htm
+
+testexecute z:\trecog\trecogpkcs12.script
+move c:\logs\testexecute\trecogpkcs12.htm e:\testresults\trecogpkcs12.htm
+
+REM Enable the following test when DEF076875(or relevant CR) is done.
+REM runtlsclientauth.bat
+
+// run if authserver is included
+runauthtests.bat
+
+runfiletokens.bat
+