summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew Jeffery <andrew@aj.id.au>2018-02-22 12:04:02 +1030
committerAndrew Jeffery <andrew@aj.id.au>2018-03-24 13:59:32 +1030
commit0b657f4d5d211fef6051be6ad97e85b1ba58473d (patch)
treeb5bdc1cbd791d64c0569533628b374a26dfdfef5
parent812923d07d592e8327767ed5dbf60a670272cf61 (diff)
downloadphosphor-mboxd-0b657f4d5d211fef6051be6ad97e85b1ba58473d.tar.gz
phosphor-mboxd-0b657f4d5d211fef6051be6ad97e85b1ba58473d.zip
create_read_window_vpnor: Integrate VpnorRoot
Change-Id: Ibb2ea631d3bb903a6607edac085d3025479e5ff7 Signed-off-by: Andrew Jeffery <andrew@aj.id.au>
-rw-r--r--test/vpnor/create_read_window_vpnor.cpp43
1 files changed, 19 insertions, 24 deletions
diff --git a/test/vpnor/create_read_window_vpnor.cpp b/test/vpnor/create_read_window_vpnor.cpp
index 24a8e42..f4c80de 100644
--- a/test/vpnor/create_read_window_vpnor.cpp
+++ b/test/vpnor/create_read_window_vpnor.cpp
@@ -32,11 +32,14 @@ extern "C" {
#include <fstream>
#include <experimental/filesystem>
+#include "test/vpnor/tmpd.hpp"
+
// A read window assumes that the toc is located at offset 0,
// so create dummy partition at arbitrary offset 0x100.
-constexpr auto line = "partition01=HBB,00000100,0001000,ECC,PRESERVED";
-constexpr auto partition = "HBB";
-char tmplt[] = "/tmp/create_read_test.XXXXXX";
+const std::string toc[] = {
+ "partition01=HBB,00000100,0001000,ECC,PRESERVED",
+};
+
uint8_t data[8] = {0xaa, 0x55, 0xaa, 0x66, 0x77, 0x88, 0x99, 0xab};
#define BLOCK_SIZE 4096
@@ -48,6 +51,7 @@ uint8_t data[8] = {0xaa, 0x55, 0xaa, 0x66, 0x77, 0x88, 0x99, 0xab};
static const uint8_t get_info[] = {0x02, 0x00, 0x02, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00};
+
// offset 0x100 and size 6
static const uint8_t create_read_window[] = {0x04, 0x01, 0x01, 0x00, 0x06, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -57,36 +61,28 @@ static const uint8_t response[] = {0x04, 0x01, 0xfe, 0xff, 0x01, 0x00, 0x01,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01};
namespace fs = std::experimental::filesystem;
+namespace test = openpower::virtual_pnor::test;
int main()
{
- char* tmpdir = mkdtemp(tmplt);
- assert(tmpdir != nullptr);
-
- // create the toc file
- fs::path tocFilePath{tmpdir};
- tocFilePath /= PARTITION_TOC_FILE;
- std::ofstream tocFile(tocFilePath.c_str());
- tocFile.write(line, strlen(line));
- tocFile.close();
+ fs::path path;
+ const char *cpath;
- // create the partition file
- fs::path partitionFilePath{tmpdir};
- partitionFilePath /= partition;
- std::ofstream partitionFile(partitionFilePath.c_str());
+ test::VpnorRoot root(toc, BLOCK_SIZE);
+ root.write("HBB", data, sizeof(data));
- partitionFile.write((char*)data, sizeof(data));
- partitionFile.close();
+ path = root.path();
+ cpath = path.c_str();
system_set_reserved_size(MEM_SIZE);
system_set_mtd_sizes(MEM_SIZE, ERASE_SIZE);
- struct mbox_context* ctx = mbox_create_test_context(N_WINDOWS, WINDOW_SIZE);
- strcpy(ctx->paths.ro_loc, tmpdir);
- strcpy(ctx->paths.rw_loc, tmpdir);
- strcpy(ctx->paths.prsv_loc, tmpdir);
+ struct mbox_context *ctx = mbox_create_test_context(N_WINDOWS, WINDOW_SIZE);
+ strcpy(ctx->paths.ro_loc, cpath);
+ strcpy(ctx->paths.rw_loc, cpath);
+ strcpy(ctx->paths.prsv_loc, cpath);
- vpnor_create_partition_table_from_path(ctx, tmpdir);
+ vpnor_create_partition_table_from_path(ctx, cpath);
int rc = mbox_command_dispatch(ctx, get_info, sizeof(get_info));
assert(rc == 1);
@@ -107,6 +103,5 @@ int main()
// Read beyond the partition file size.
// openbmc/openbmc#1868
- fs::remove_all(fs::path{tmpdir});
return rc;
}
OpenPOWER on IntegriCloud