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

testsuite/tcg/nv/Tspi_NV_DefineSpace12.c

Index: testsuite/tcg/nv/Tspi_NV_DefineSpace12.c
diff --git a/testsuite/tcg/nv/Tspi_NV_DefineSpace12.c b/testsuite/tcg/nv/Tspi_NV_DefineSpace12.c
index f675ade3d6c9876f6fea9181351e844afc0f658f..fcfee95d53f25d9f09a24bf7a18a2117f4a5cac6 100644
--- a/testsuite/tcg/nv/Tspi_NV_DefineSpace12.c
+++ b/testsuite/tcg/nv/Tspi_NV_DefineSpace12.c
@@ -173,10 +173,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);
+			Tspi_Context_FreeMemory(hContext, NULL);
+			Tspi_Context_Close(hContext);
+#endif
+                	exit(-1);
+		}
 		Tspi_Context_FreeMemory(hContext, NULL);
 		Tspi_Context_Close(hContext);
-                if ( result == TSS_SUCCESS )
-                    exit(-1);
 		exit(result);
      	}