提交 feb26b85 编写于 作者: P Peter Krempa

tests: virstoragetest: Remove now unused pathAbs

Separately remove the now unused variable.
上级 7ba6a6f9
...@@ -283,7 +283,6 @@ struct _testFileData ...@@ -283,7 +283,6 @@ struct _testFileData
unsigned long long expCapacity; unsigned long long expCapacity;
bool expEncrypted; bool expEncrypted;
const char *pathRel; const char *pathRel;
const char *pathAbs;
const char *path; const char *path;
const char *relDirRel; const char *relDirRel;
const char *relDirAbs; const char *relDirAbs;
...@@ -734,7 +733,6 @@ mymain(void) ...@@ -734,7 +733,6 @@ mymain(void)
/* Raw image, whether with right format or no specified format */ /* Raw image, whether with right format or no specified format */
testFileData raw = { testFileData raw = {
.pathAbs = canonraw,
.path = canonraw, .path = canonraw,
.relDirRel = ".", .relDirRel = ".",
.relDirAbs = datadir, .relDirAbs = datadir,
...@@ -753,12 +751,10 @@ mymain(void) ...@@ -753,12 +751,10 @@ mymain(void)
(&raw), ALLOW_PROBE | EXP_PASS); (&raw), ALLOW_PROBE | EXP_PASS);
/* Qcow2 file with relative raw backing, format provided */ /* Qcow2 file with relative raw backing, format provided */
raw.pathAbs = "raw";
raw.pathRel = "raw"; raw.pathRel = "raw";
testFileData qcow2 = { testFileData qcow2 = {
.expBackingStoreRaw = "raw", .expBackingStoreRaw = "raw",
.expCapacity = 1024, .expCapacity = 1024,
.pathAbs = canonqcow2,
.path = canonqcow2, .path = canonqcow2,
.relDirRel = ".", .relDirRel = ".",
.relDirAbs = datadir, .relDirAbs = datadir,
...@@ -766,7 +762,6 @@ mymain(void) ...@@ -766,7 +762,6 @@ mymain(void)
.format = VIR_STORAGE_FILE_QCOW2, .format = VIR_STORAGE_FILE_QCOW2,
}; };
testFileData qcow2_as_raw = { testFileData qcow2_as_raw = {
.pathAbs = canonqcow2,
.path = canonqcow2, .path = canonqcow2,
.relDirRel = ".", .relDirRel = ".",
.relDirAbs = datadir, .relDirAbs = datadir,
...@@ -792,7 +787,6 @@ mymain(void) ...@@ -792,7 +787,6 @@ mymain(void)
ret = -1; ret = -1;
qcow2.expBackingStoreRaw = absraw; qcow2.expBackingStoreRaw = absraw;
raw.pathRel = NULL; raw.pathRel = NULL;
raw.pathAbs = absraw;
raw.relDirRel = datadir; raw.relDirRel = datadir;
/* Qcow2 file with raw as absolute backing, backing format provided */ /* Qcow2 file with raw as absolute backing, backing format provided */
...@@ -811,7 +805,6 @@ mymain(void) ...@@ -811,7 +805,6 @@ mymain(void)
testFileData wrap = { testFileData wrap = {
.expBackingStoreRaw = absqcow2, .expBackingStoreRaw = absqcow2,
.expCapacity = 1024, .expCapacity = 1024,
.pathAbs = abswrap,
.path = canonwrap, .path = canonwrap,
.relDirRel = ".", .relDirRel = ".",
.relDirAbs = datadir, .relDirAbs = datadir,
...@@ -843,7 +836,6 @@ mymain(void) ...@@ -843,7 +836,6 @@ mymain(void)
testFileData wrap_as_raw = { testFileData wrap_as_raw = {
.expBackingStoreRaw = absqcow2, .expBackingStoreRaw = absqcow2,
.expCapacity = 1024, .expCapacity = 1024,
.pathAbs = abswrap,
.path = canonwrap, .path = canonwrap,
.relDirRel = ".", .relDirRel = ".",
.relDirAbs = datadir, .relDirAbs = datadir,
...@@ -898,7 +890,6 @@ mymain(void) ...@@ -898,7 +890,6 @@ mymain(void)
/* Qcow2 file with backing protocol instead of file */ /* Qcow2 file with backing protocol instead of file */
testFileData nbd = { testFileData nbd = {
.pathAbs = "nbd:example.org:6000:exportname=blah",
.path = "blah", .path = "blah",
.type = VIR_STORAGE_TYPE_NETWORK, .type = VIR_STORAGE_TYPE_NETWORK,
.format = VIR_STORAGE_FILE_RAW, .format = VIR_STORAGE_FILE_RAW,
...@@ -915,7 +906,6 @@ mymain(void) ...@@ -915,7 +906,6 @@ mymain(void)
testFileData qed = { testFileData qed = {
.expBackingStoreRaw = absraw, .expBackingStoreRaw = absraw,
.expCapacity = 1024, .expCapacity = 1024,
.pathAbs = absqed,
.path = canonqed, .path = canonqed,
.relDirRel = ".", .relDirRel = ".",
.relDirAbs = datadir, .relDirAbs = datadir,
...@@ -923,7 +913,6 @@ mymain(void) ...@@ -923,7 +913,6 @@ mymain(void)
.format = VIR_STORAGE_FILE_QED, .format = VIR_STORAGE_FILE_QED,
}; };
testFileData qed_as_raw = { testFileData qed_as_raw = {
.pathAbs = absqed,
.path = canonqed, .path = canonqed,
.relDirRel = ".", .relDirRel = ".",
.relDirAbs = datadir, .relDirAbs = datadir,
...@@ -938,7 +927,6 @@ mymain(void) ...@@ -938,7 +927,6 @@ mymain(void)
/* directory */ /* directory */
testFileData dir = { testFileData dir = {
.pathAbs = absdir,
.path = canondir, .path = canondir,
.relDirRel = ".", .relDirRel = ".",
.relDirAbs = datadir, .relDirAbs = datadir,
...@@ -977,7 +965,6 @@ mymain(void) ...@@ -977,7 +965,6 @@ mymain(void)
.expBackingStoreRaw = "../raw", .expBackingStoreRaw = "../raw",
.expCapacity = 1024, .expCapacity = 1024,
.pathRel = "../sub/link1", .pathRel = "../sub/link1",
.pathAbs = "../sub/link1",
.path = canonqcow2, .path = canonqcow2,
.relDirRel = "sub/../sub", .relDirRel = "sub/../sub",
.relDirAbs = datadir "/sub/../sub", .relDirAbs = datadir "/sub/../sub",
...@@ -987,7 +974,6 @@ mymain(void) ...@@ -987,7 +974,6 @@ mymain(void)
testFileData link2 = { testFileData link2 = {
.expBackingStoreRaw = "../sub/link1", .expBackingStoreRaw = "../sub/link1",
.expCapacity = 1024, .expCapacity = 1024,
.pathAbs = abslink2,
.path = canonwrap, .path = canonwrap,
.relDirRel = "sub", .relDirRel = "sub",
.relDirAbs = datadir "/sub", .relDirAbs = datadir "/sub",
...@@ -995,7 +981,6 @@ mymain(void) ...@@ -995,7 +981,6 @@ mymain(void)
.format = VIR_STORAGE_FILE_QCOW2, .format = VIR_STORAGE_FILE_QCOW2,
}; };
raw.pathRel = "../raw"; raw.pathRel = "../raw";
raw.pathAbs = "../raw";
raw.relDirRel = "sub/../sub/.."; raw.relDirRel = "sub/../sub/..";
raw.relDirAbs = datadir "/sub/../sub/.."; raw.relDirAbs = datadir "/sub/../sub/..";
TEST_CHAIN(15, "sub/link2", abslink2, VIR_STORAGE_FILE_QCOW2, TEST_CHAIN(15, "sub/link2", abslink2, VIR_STORAGE_FILE_QCOW2,
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册