Upgrade from trousers 0.3.3 to 0.3.6 and from testsuite 0.2 to 0.3.

testsuite/tcg/nv/Tspi_NV_DefineSpace11.c

 /*
  * The Initial Developer of the Original Code is Intel Corporation. 
  * Portions created by Intel Corporation are Copyright (C) 2007 Intel Corporation. 
  * All Rights Reserved.
  *
  * This program is free software;  you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
  *
@@ skipping 180 matching lines @@
                 Tspi_Context_Close(hContext);
                 exit(result);
         }
 
         /*Define NV space*/
         result = Tspi_NV_DefineSpace(hNVStore, 0, 0);
 
 #ifdef NV_LOCKED
        if (TSS_ERROR_CODE(result)== TPM_E_BADINDEX)
        {
-               print_success(nameOfFunction, result);
+                print_success(nameOfFunction, result);
                 print_end_test(nameOfFunction);
                 Tspi_Context_FreeMemory(hContext, NULL);
                 Tspi_Context_Close(hContext);
                 exit(0);
        }
        else{
                 print_error("Tspi_NV_DefineSpace", result);
                 print_end_test(nameOfFunction);
+                if ( result == TSS_SUCCESS ) {
+#ifdef CLEAR_TEST_INDEX
+                        Tspi_Context_GetTpmObject(hContext, &hTPM);
+                        Tspi_GetPolicyObject(hTPM, TSS_POLICY_USAGE, &hPolicy);
+                        Tspi_Policy_SetSecret( hPolicy, TESTSUITE_OWNER_SECRET_MODE,
+                                        TESTSUITE_OWNER_SECRET_LEN, TESTSUITE_OWNER_SECRET);
+                        Tspi_NV_ReleaseSpace(hNVStore);
+#endif
+                        Tspi_Context_FreeMemory(hContext, NULL);
+                        Tspi_Context_Close(hContext);
+                        exit(-1);
+                }
                 Tspi_Context_FreeMemory(hContext, NULL);
                 Tspi_Context_Close(hContext);
-                if ( result == TSS_SUCCESS )
-                        exit(-1);
                 exit(result);
         }
 
 #else
        if (result== TSS_SUCCESS)
        {
                 print_success(nameOfFunction, result);
                 print_end_test(nameOfFunction);
 
         #ifdef CLEAR_TEST_INDEX
@@ skipping 10 matching lines @@
        }
        else{
                 print_error("Tspi_NV_DefineSpace", result);
                 print_end_test(nameOfFunction);
                 Tspi_Context_FreeMemory(hContext, NULL);
                 Tspi_Context_Close(hContext);
                 exit(result);
         }
 #endif
 }