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

Index: testsuite/tcg/nv/Tspi_NV_DefineSpace11.c
diff --git a/testsuite/tcg/nv/Tspi_NV_DefineSpace11.c b/testsuite/tcg/nv/Tspi_NV_DefineSpace11.c
index e657cfce5e388679eba5362ba224e774c8943e6a..4eee8eefaaa1a6ffaa5375e2e628fa55bf11a30a 100644
--- a/testsuite/tcg/nv/Tspi_NV_DefineSpace11.c
+++ b/testsuite/tcg/nv/Tspi_NV_DefineSpace11.c
@@ -198,7 +198,7 @@ main_v1_2(char version)
 #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);
@@ -207,10 +207,20 @@ main_v1_2(char version)
        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);
 	}