From bf6b9655dfbfa51a7dba2cd24f2580fc8da54ceb Mon Sep 17 00:00:00 2001
From: Lakira Ashley <lakridesagain@gmail.com>
Date: Tue, 29 Nov 2022 11:48:54 +1030
Subject: [PATCH] Fix up configuration tests

---
 lib/xilinx/tests/spartan6/configuration_test.cc  | 5 +++--
 lib/xilinx/tests/xc7series/configuration_test.cc | 5 +++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/lib/xilinx/tests/spartan6/configuration_test.cc b/lib/xilinx/tests/spartan6/configuration_test.cc
index 522438195..82261da7c 100644
--- a/lib/xilinx/tests/spartan6/configuration_test.cc
+++ b/lib/xilinx/tests/spartan6/configuration_test.cc
@@ -153,7 +153,8 @@ TEST(ConfigurationTest, DISABLED_CheckForPaddingAfterIOBFrame) {
 	        frames.getFrames(), test_part);
 	// createType2ConfigurationPacketData should add a 16-bit pad word after
 	// after the IOB frame
-	EXPECT_EQ(packet_data.size(), 3 * 65 + 1);
+	EXPECT_EQ(packet_data.frames.size(), 1);
+	EXPECT_EQ(packet_data.frames[0].data.size(), 3 * 65 + 1);
 
 	std::vector<uint32_t> idcode{0x1234};
 	std::vector<uint32_t> cmd{0x0001};
@@ -182,7 +183,7 @@ TEST(ConfigurationTest, DISABLED_CheckForPaddingAfterIOBFrame) {
 	        static_cast<unsigned int>(0x1),
 	        ConfigurationPacket<Spartan6::ConfRegType>::Opcode::Write,
 	        Spartan6::ConfRegType::FDRI,
-	        absl::MakeSpan(packet_data),
+	        absl::MakeSpan(packet_data.frames[0].data),
 	    },
 	};
 
diff --git a/lib/xilinx/tests/xc7series/configuration_test.cc b/lib/xilinx/tests/xc7series/configuration_test.cc
index 12917786b..11f054bc9 100644
--- a/lib/xilinx/tests/xc7series/configuration_test.cc
+++ b/lib/xilinx/tests/xc7series/configuration_test.cc
@@ -278,7 +278,8 @@ TEST(ConfigurationTest, CheckForPaddingFrames) {
 	// extra padding frames are added at the end of the creation of the data
 	// overall this gives us: 5(real frames) + 4*2 + 2 = 15 frames, which is
 	// 15 * 101 = 1515 words
-	EXPECT_EQ(packet_data.size(), 15 * 101);
+	EXPECT_EQ(packet_data.frames.size(), 1);
+	EXPECT_EQ(packet_data.frames[0].data.size(), 15 * 101);
 
 	std::vector<uint32_t> idcode{0x1234};
 	std::vector<uint32_t> cmd{0x0001};
@@ -307,7 +308,7 @@ TEST(ConfigurationTest, CheckForPaddingFrames) {
 	        static_cast<unsigned int>(0x1),
 	        ConfigurationPacket<Series7::ConfRegType>::Opcode::Write,
 	        Series7::ConfRegType::FDRI,
-	        absl::MakeSpan(packet_data),
+	        absl::MakeSpan(packet_data.frames[0].data),
 	    },
 	};