context changes

verification/emulator.go

@@ -30,7 +30,7 @@ const (
 )
 
 // Added dummy support for emulator .This is to verify against the support_needed list
-var emulator_supports = []string{"AutoInit", "X509", "Simulation"}
+var emulator_supports = []string{"AutoInit", "X509", "Simulation", "Tagging"}
 
 //TODO code for emulator to start, stop, getsupport
 
@@ -164,6 +164,10 @@ func (s *DpeEmulator) GetSupport() *Support {
 	return &s.supports
 }
 
+func (s *DpeEmulator) SetSupport(support Support) {
+	s.supports = support
+}
+
 func (s *DpeEmulator) GetProfile() Profile {
 	return DPE_EMULATOR_PROFILE
 }

verification/initializeContext_test.go

@@ -104,10 +104,10 @@ func testInitContext(d TestDPEInstance, t *testing.T) {
 
 		// Try to get the correct error for overflowing the contexts. Fill up the
 		// rest of the contexts (-1 for default).
-		for i := uint32(0); i < getProfileRsp.MaxTciNodes-1; i++ {
+		for i := uint32(0); i < getProfileRsp.MaxTciNodes-2; i++ {
 			initCtxResp, err := client.InitializeContext(NewInitCtxIsSimulation())
 			if err != nil {
-				t.Fatal("The instance should be able to create a simulation context.")
+				t.Fatal("The instance should be able to create a simulation context.", err)
 			}
 			// Could prove difficult to prove it is a cryptographically secure random.
 			if initCtxResp.Handle == [16]byte{0} {

verification/simulator.go

@@ -159,6 +159,10 @@ func (s *DpeSimulator) GetSupport() *Support {
 	return &s.supports
 }
 
+func (s *DpeSimulator) SetSupport(support Support) {
+	s.supports = support
+}
+
 func (s *DpeSimulator) GetProfile() Profile {
 	return DPE_SIMULATOR_PROFILE
 }

verification/verification_test.go

@@ -23,13 +23,13 @@ var testTargetType string
 
 // This will be called before running tests, and it assigns the socket path based on command line flag.
 func TestMain(m *testing.M) {
-	testTarget := flag.String("target", "emulator", "socket type - simulator")
+	testTarget := flag.String("target", "simulator", "socket type - emulator")
 	flag.Parse()
 	testTargetType = *testTarget
 	if testTargetType == SIMULATOR {
 		target_exe = flag.String("sim", "../simulator/target/debug/simulator", "path to simulator executable")
 	} else if testTargetType == EMULATOR {
-		target_exe = flag.String("emu", "../server/example", "path to emulator executable")
+		target_exe = flag.String("emu", "../emulator/target/debug/emulator", "path to emulator executable")
 	}
 
 	exitVal := m.Run()
@@ -52,6 +52,8 @@ type TestDPEInstance interface {
 	// it supports, but this function is used by tests to know how to test the DPE
 	// instance.
 	GetSupport() *Support
+	//Set the Support
+	SetSupport(support Support)
 	// Returns the profile the transport supports.
 	GetProfile() Profile
 	// Returns a slice of all the localities the instance supports.
@@ -128,6 +130,7 @@ func GetEmulatorTarget(support_needed []string) (TestDPEInstance, error) {
 			return nil, errors.New("Error in creating dpe instances - supported feature is not enabled in emulator")
 		}
 	}
+	instance.SetSupport(support)
 	return instance, nil
 }