summaryrefslogtreecommitdiffstats
path: root/testsuite
diff options
context:
space:
mode:
Diffstat (limited to 'testsuite')
-rw-r--r--testsuite/.gitignore3
-rw-r--r--testsuite/rootfs-pristine/test-tools/insert/lib/modules/4.4.4/modules.alias1
-rw-r--r--testsuite/rootfs-pristine/test-tools/insert/lib/modules/4.4.4/modules.alias.binbin12 -> 0 bytes
-rw-r--r--testsuite/rootfs-pristine/test-tools/insert/lib/modules/4.4.4/modules.builtin0
-rw-r--r--testsuite/rootfs-pristine/test-tools/insert/lib/modules/4.4.4/modules.builtin.binbin12 -> 0 bytes
-rw-r--r--testsuite/rootfs-pristine/test-tools/insert/lib/modules/4.4.4/modules.dep1
-rw-r--r--testsuite/rootfs-pristine/test-tools/insert/lib/modules/4.4.4/modules.dep.binbin58 -> 0 bytes
-rw-r--r--testsuite/rootfs-pristine/test-tools/insert/lib/modules/4.4.4/modules.devname1
-rw-r--r--testsuite/rootfs-pristine/test-tools/insert/lib/modules/4.4.4/modules.order0
-rw-r--r--testsuite/rootfs-pristine/test-tools/insert/lib/modules/4.4.4/modules.softdep1
-rw-r--r--testsuite/rootfs-pristine/test-tools/insert/lib/modules/4.4.4/modules.symbols1
-rw-r--r--testsuite/rootfs-pristine/test-tools/insert/lib/modules/4.4.4/modules.symbols.binbin12 -> 0 bytes
-rw-r--r--testsuite/rootfs-pristine/test-tools/remove/lib/modules/4.4.4/modules.alias1
-rw-r--r--testsuite/rootfs-pristine/test-tools/remove/lib/modules/4.4.4/modules.alias.binbin12 -> 0 bytes
-rw-r--r--testsuite/rootfs-pristine/test-tools/remove/lib/modules/4.4.4/modules.builtin0
-rw-r--r--testsuite/rootfs-pristine/test-tools/remove/lib/modules/4.4.4/modules.builtin.binbin12 -> 0 bytes
-rw-r--r--testsuite/rootfs-pristine/test-tools/remove/lib/modules/4.4.4/modules.dep1
-rw-r--r--testsuite/rootfs-pristine/test-tools/remove/lib/modules/4.4.4/modules.dep.binbin58 -> 0 bytes
-rw-r--r--testsuite/rootfs-pristine/test-tools/remove/lib/modules/4.4.4/modules.devname1
-rw-r--r--testsuite/rootfs-pristine/test-tools/remove/lib/modules/4.4.4/modules.order0
-rw-r--r--testsuite/rootfs-pristine/test-tools/remove/lib/modules/4.4.4/modules.softdep1
-rw-r--r--testsuite/rootfs-pristine/test-tools/remove/lib/modules/4.4.4/modules.symbols1
-rw-r--r--testsuite/rootfs-pristine/test-tools/remove/lib/modules/4.4.4/modules.symbols.binbin12 -> 0 bytes
-rw-r--r--testsuite/rootfs-pristine/test-tools/remove/sys/module/mod_simple/holders/.gitignore0
-rw-r--r--testsuite/rootfs-pristine/test-tools/remove/sys/module/mod_simple/initstate1
-rw-r--r--testsuite/rootfs-pristine/test-tools/remove/sys/module/mod_simple/refcnt1
-rwxr-xr-xtestsuite/setup-rootfs.sh2
-rw-r--r--testsuite/test-tools.c71
28 files changed, 0 insertions, 88 deletions
diff --git a/testsuite/.gitignore b/testsuite/.gitignore
index 9d26b88..5465b1a 100644
--- a/testsuite/.gitignore
+++ b/testsuite/.gitignore
@@ -18,7 +18,6 @@
/test-modprobe
/test-hash
/test-list
-/test-tools
/rootfs
/stamp-rootfs
/test-scratchbuf.log
@@ -53,5 +52,3 @@
/test-testsuite.trs
/test-list.log
/test-list.trs
-/test-tools.log
-/test-tools.trs
diff --git a/testsuite/rootfs-pristine/test-tools/insert/lib/modules/4.4.4/modules.alias b/testsuite/rootfs-pristine/test-tools/insert/lib/modules/4.4.4/modules.alias
deleted file mode 100644
index ba76e18..0000000
--- a/testsuite/rootfs-pristine/test-tools/insert/lib/modules/4.4.4/modules.alias
+++ /dev/null
@@ -1 +0,0 @@
-# Aliases extracted from modules themselves.
diff --git a/testsuite/rootfs-pristine/test-tools/insert/lib/modules/4.4.4/modules.alias.bin b/testsuite/rootfs-pristine/test-tools/insert/lib/modules/4.4.4/modules.alias.bin
deleted file mode 100644
index 7075435..0000000
--- a/testsuite/rootfs-pristine/test-tools/insert/lib/modules/4.4.4/modules.alias.bin
+++ /dev/null
Binary files differ
diff --git a/testsuite/rootfs-pristine/test-tools/insert/lib/modules/4.4.4/modules.builtin b/testsuite/rootfs-pristine/test-tools/insert/lib/modules/4.4.4/modules.builtin
deleted file mode 100644
index e69de29..0000000
--- a/testsuite/rootfs-pristine/test-tools/insert/lib/modules/4.4.4/modules.builtin
+++ /dev/null
diff --git a/testsuite/rootfs-pristine/test-tools/insert/lib/modules/4.4.4/modules.builtin.bin b/testsuite/rootfs-pristine/test-tools/insert/lib/modules/4.4.4/modules.builtin.bin
deleted file mode 100644
index 7075435..0000000
--- a/testsuite/rootfs-pristine/test-tools/insert/lib/modules/4.4.4/modules.builtin.bin
+++ /dev/null
Binary files differ
diff --git a/testsuite/rootfs-pristine/test-tools/insert/lib/modules/4.4.4/modules.dep b/testsuite/rootfs-pristine/test-tools/insert/lib/modules/4.4.4/modules.dep
deleted file mode 100644
index 5476653..0000000
--- a/testsuite/rootfs-pristine/test-tools/insert/lib/modules/4.4.4/modules.dep
+++ /dev/null
@@ -1 +0,0 @@
-kernel/mod-simple.ko:
diff --git a/testsuite/rootfs-pristine/test-tools/insert/lib/modules/4.4.4/modules.dep.bin b/testsuite/rootfs-pristine/test-tools/insert/lib/modules/4.4.4/modules.dep.bin
deleted file mode 100644
index b09a854..0000000
--- a/testsuite/rootfs-pristine/test-tools/insert/lib/modules/4.4.4/modules.dep.bin
+++ /dev/null
Binary files differ
diff --git a/testsuite/rootfs-pristine/test-tools/insert/lib/modules/4.4.4/modules.devname b/testsuite/rootfs-pristine/test-tools/insert/lib/modules/4.4.4/modules.devname
deleted file mode 100644
index 58f6d6d..0000000
--- a/testsuite/rootfs-pristine/test-tools/insert/lib/modules/4.4.4/modules.devname
+++ /dev/null
@@ -1 +0,0 @@
-# Device nodes to trigger on-demand module loading.
diff --git a/testsuite/rootfs-pristine/test-tools/insert/lib/modules/4.4.4/modules.order b/testsuite/rootfs-pristine/test-tools/insert/lib/modules/4.4.4/modules.order
deleted file mode 100644
index e69de29..0000000
--- a/testsuite/rootfs-pristine/test-tools/insert/lib/modules/4.4.4/modules.order
+++ /dev/null
diff --git a/testsuite/rootfs-pristine/test-tools/insert/lib/modules/4.4.4/modules.softdep b/testsuite/rootfs-pristine/test-tools/insert/lib/modules/4.4.4/modules.softdep
deleted file mode 100644
index 5554ccc..0000000
--- a/testsuite/rootfs-pristine/test-tools/insert/lib/modules/4.4.4/modules.softdep
+++ /dev/null
@@ -1 +0,0 @@
-# Soft dependencies extracted from modules themselves.
diff --git a/testsuite/rootfs-pristine/test-tools/insert/lib/modules/4.4.4/modules.symbols b/testsuite/rootfs-pristine/test-tools/insert/lib/modules/4.4.4/modules.symbols
deleted file mode 100644
index 618c345..0000000
--- a/testsuite/rootfs-pristine/test-tools/insert/lib/modules/4.4.4/modules.symbols
+++ /dev/null
@@ -1 +0,0 @@
-# Aliases for symbols, used by symbol_request().
diff --git a/testsuite/rootfs-pristine/test-tools/insert/lib/modules/4.4.4/modules.symbols.bin b/testsuite/rootfs-pristine/test-tools/insert/lib/modules/4.4.4/modules.symbols.bin
deleted file mode 100644
index 7075435..0000000
--- a/testsuite/rootfs-pristine/test-tools/insert/lib/modules/4.4.4/modules.symbols.bin
+++ /dev/null
Binary files differ
diff --git a/testsuite/rootfs-pristine/test-tools/remove/lib/modules/4.4.4/modules.alias b/testsuite/rootfs-pristine/test-tools/remove/lib/modules/4.4.4/modules.alias
deleted file mode 100644
index ba76e18..0000000
--- a/testsuite/rootfs-pristine/test-tools/remove/lib/modules/4.4.4/modules.alias
+++ /dev/null
@@ -1 +0,0 @@
-# Aliases extracted from modules themselves.
diff --git a/testsuite/rootfs-pristine/test-tools/remove/lib/modules/4.4.4/modules.alias.bin b/testsuite/rootfs-pristine/test-tools/remove/lib/modules/4.4.4/modules.alias.bin
deleted file mode 100644
index 7075435..0000000
--- a/testsuite/rootfs-pristine/test-tools/remove/lib/modules/4.4.4/modules.alias.bin
+++ /dev/null
Binary files differ
diff --git a/testsuite/rootfs-pristine/test-tools/remove/lib/modules/4.4.4/modules.builtin b/testsuite/rootfs-pristine/test-tools/remove/lib/modules/4.4.4/modules.builtin
deleted file mode 100644
index e69de29..0000000
--- a/testsuite/rootfs-pristine/test-tools/remove/lib/modules/4.4.4/modules.builtin
+++ /dev/null
diff --git a/testsuite/rootfs-pristine/test-tools/remove/lib/modules/4.4.4/modules.builtin.bin b/testsuite/rootfs-pristine/test-tools/remove/lib/modules/4.4.4/modules.builtin.bin
deleted file mode 100644
index 7075435..0000000
--- a/testsuite/rootfs-pristine/test-tools/remove/lib/modules/4.4.4/modules.builtin.bin
+++ /dev/null
Binary files differ
diff --git a/testsuite/rootfs-pristine/test-tools/remove/lib/modules/4.4.4/modules.dep b/testsuite/rootfs-pristine/test-tools/remove/lib/modules/4.4.4/modules.dep
deleted file mode 100644
index 5476653..0000000
--- a/testsuite/rootfs-pristine/test-tools/remove/lib/modules/4.4.4/modules.dep
+++ /dev/null
@@ -1 +0,0 @@
-kernel/mod-simple.ko:
diff --git a/testsuite/rootfs-pristine/test-tools/remove/lib/modules/4.4.4/modules.dep.bin b/testsuite/rootfs-pristine/test-tools/remove/lib/modules/4.4.4/modules.dep.bin
deleted file mode 100644
index b09a854..0000000
--- a/testsuite/rootfs-pristine/test-tools/remove/lib/modules/4.4.4/modules.dep.bin
+++ /dev/null
Binary files differ
diff --git a/testsuite/rootfs-pristine/test-tools/remove/lib/modules/4.4.4/modules.devname b/testsuite/rootfs-pristine/test-tools/remove/lib/modules/4.4.4/modules.devname
deleted file mode 100644
index 58f6d6d..0000000
--- a/testsuite/rootfs-pristine/test-tools/remove/lib/modules/4.4.4/modules.devname
+++ /dev/null
@@ -1 +0,0 @@
-# Device nodes to trigger on-demand module loading.
diff --git a/testsuite/rootfs-pristine/test-tools/remove/lib/modules/4.4.4/modules.order b/testsuite/rootfs-pristine/test-tools/remove/lib/modules/4.4.4/modules.order
deleted file mode 100644
index e69de29..0000000
--- a/testsuite/rootfs-pristine/test-tools/remove/lib/modules/4.4.4/modules.order
+++ /dev/null
diff --git a/testsuite/rootfs-pristine/test-tools/remove/lib/modules/4.4.4/modules.softdep b/testsuite/rootfs-pristine/test-tools/remove/lib/modules/4.4.4/modules.softdep
deleted file mode 100644
index 5554ccc..0000000
--- a/testsuite/rootfs-pristine/test-tools/remove/lib/modules/4.4.4/modules.softdep
+++ /dev/null
@@ -1 +0,0 @@
-# Soft dependencies extracted from modules themselves.
diff --git a/testsuite/rootfs-pristine/test-tools/remove/lib/modules/4.4.4/modules.symbols b/testsuite/rootfs-pristine/test-tools/remove/lib/modules/4.4.4/modules.symbols
deleted file mode 100644
index 618c345..0000000
--- a/testsuite/rootfs-pristine/test-tools/remove/lib/modules/4.4.4/modules.symbols
+++ /dev/null
@@ -1 +0,0 @@
-# Aliases for symbols, used by symbol_request().
diff --git a/testsuite/rootfs-pristine/test-tools/remove/lib/modules/4.4.4/modules.symbols.bin b/testsuite/rootfs-pristine/test-tools/remove/lib/modules/4.4.4/modules.symbols.bin
deleted file mode 100644
index 7075435..0000000
--- a/testsuite/rootfs-pristine/test-tools/remove/lib/modules/4.4.4/modules.symbols.bin
+++ /dev/null
Binary files differ
diff --git a/testsuite/rootfs-pristine/test-tools/remove/sys/module/mod_simple/holders/.gitignore b/testsuite/rootfs-pristine/test-tools/remove/sys/module/mod_simple/holders/.gitignore
deleted file mode 100644
index e69de29..0000000
--- a/testsuite/rootfs-pristine/test-tools/remove/sys/module/mod_simple/holders/.gitignore
+++ /dev/null
diff --git a/testsuite/rootfs-pristine/test-tools/remove/sys/module/mod_simple/initstate b/testsuite/rootfs-pristine/test-tools/remove/sys/module/mod_simple/initstate
deleted file mode 100644
index e23fe64..0000000
--- a/testsuite/rootfs-pristine/test-tools/remove/sys/module/mod_simple/initstate
+++ /dev/null
@@ -1 +0,0 @@
-live
diff --git a/testsuite/rootfs-pristine/test-tools/remove/sys/module/mod_simple/refcnt b/testsuite/rootfs-pristine/test-tools/remove/sys/module/mod_simple/refcnt
deleted file mode 100644
index 573541a..0000000
--- a/testsuite/rootfs-pristine/test-tools/remove/sys/module/mod_simple/refcnt
+++ /dev/null
@@ -1 +0,0 @@
-0
diff --git a/testsuite/setup-rootfs.sh b/testsuite/setup-rootfs.sh
index a780f93..5477c69 100755
--- a/testsuite/setup-rootfs.sh
+++ b/testsuite/setup-rootfs.sh
@@ -103,8 +103,6 @@ map=(
["test-modinfo/mod-simple-sha256.ko"]="mod-simple.ko"
["test-modinfo/mod-simple-pkcs7.ko"]="mod-simple.ko"
["test-modinfo/external/lib/modules/external/mod-simple.ko"]="mod-simple.ko"
- ["test-tools/insert$MODULE_DIRECTORY/4.4.4/kernel/"]="mod-simple.ko"
- ["test-tools/remove$MODULE_DIRECTORY/4.4.4/kernel/"]="mod-simple.ko"
)
gzip_array=(
diff --git a/testsuite/test-tools.c b/testsuite/test-tools.c
deleted file mode 100644
index 4a9ee9b..0000000
--- a/testsuite/test-tools.c
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * Copyright (C) 2015 Intel Corporation. All rights reserved.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, see <http://www.gnu.org/licenses/>.
- */
-
-#include <errno.h>
-#include <inttypes.h>
-#include <stddef.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-
-#include "testsuite.h"
-
-static noreturn int kmod_tool_insert(const struct test *t)
-{
- const char *progname = ABS_TOP_BUILDDIR "/tools/kmod";
- const char *const args[] = {
- progname,
- "insert", "mod-simple",
- NULL,
- };
-
- test_spawn_prog(progname, args);
- exit(EXIT_FAILURE);
-}
-DEFINE_TEST(kmod_tool_insert,
- .description = "check kmod insert",
- .config = {
- [TC_UNAME_R] = "4.4.4",
- [TC_ROOTFS] = TESTSUITE_ROOTFS "test-tools/insert",
- [TC_INIT_MODULE_RETCODES] = "",
- },
- .modules_loaded = "mod-simple",
- );
-
-static noreturn int kmod_tool_remove(const struct test *t)
-{
- const char *progname = ABS_TOP_BUILDDIR "/tools/kmod";
- const char *const args[] = {
- progname,
- "remove", "mod-simple",
- NULL,
- };
-
- test_spawn_prog(progname, args);
- exit(EXIT_FAILURE);
-}
-DEFINE_TEST(kmod_tool_remove,
- .description = "check kmod remove",
- .config = {
- [TC_UNAME_R] = "4.4.4",
- [TC_ROOTFS] = TESTSUITE_ROOTFS "test-tools/remove",
- [TC_DELETE_MODULE_RETCODES] = "",
- },
- );
-
-TESTSUITE_MAIN();