tests: remove calls to ihk_os_create/destroy_pseudofs

Change-Id: I04910c6a258c841437463e098fb8e02116c4f711
This commit is contained in:
Dominique Martinet
2019-03-01 14:29:18 +09:00
committed by Dominique Martinet
parent 9ec0aeeab5
commit 414cffd95b
19 changed files with 0 additions and 400 deletions

View File

@ -36,12 +36,6 @@ int main(int argc, char** argv) {
sprintf(cmd, "%s/sbin/mcstop+release.sh", prefix);
status = system(cmd);
// ihk_os_destroy_pseudofs
ret_ihklib = ihk_os_destroy_pseudofs(0, 0, 0);
fp = popen("cat /proc/mounts | grep /tmp/mcos/mcos0_sys", "r");
nread = fread(buf, 1, sizeof(buf), fp);
buf[nread] = 0;
sprintf(cmd, "insmod %s/kmod/ihk.ko", prefix);
status = system(cmd);
@ -106,14 +100,6 @@ goto shutdown;
sysfsm_setup */
usleep(100*1000);
// create pseudofs
ret_ihklib = ihk_os_create_pseudofs(0, 0, 0);
fp = popen("cat /proc/mounts | grep /tmp/mcos/mcos0_sys", "r");
nread = fread(buf, 1, sizeof(buf), fp);
buf[nread] = 0;
//OKNG(ret_ihklib == 0 &&
// strstr(buf, "/tmp/mcos/mcos0_sys") != NULL, "ihk_os_create_pseudofs()\n");
// mcexec
sprintf(cmd, "%s/bin/mcexec ls -l | grep Makefile", prefix);
fp = popen(cmd, "r");
@ -140,12 +126,6 @@ destroy:
sprintf(cmd, "rmmod %s/kmod/mcctrl.ko", prefix);
status = system(cmd);
// destroy pseudofs
ret_ihklib = ihk_os_destroy_pseudofs(0, 0, 0);
fp = popen("cat /proc/mounts | grep /tmp/mcos/mcos0_sys", "r");
nread = fread(buf, 1, sizeof(buf), fp);
buf[nread] = 0;
sprintf(cmd, "rmmod %s/kmod/%s", prefix, PART_MOD_NAME);
status = system(cmd);

View File

@ -36,12 +36,6 @@ int main(int argc, char** argv) {
sprintf(cmd, "%s/sbin/mcstop+release.sh", prefix);
status = system(cmd);
// ihk_os_destroy_pseudofs
ret_ihklib = ihk_os_destroy_pseudofs(0, 0, 0);
fp = popen("cat /proc/mounts | grep /tmp/mcos/mcos0_sys", "r");
nread = fread(buf, 1, sizeof(buf), fp);
buf[nread] = 0;
sprintf(cmd, "insmod %s/kmod/ihk.ko", prefix);
status = system(cmd);
@ -106,14 +100,6 @@ goto destroy;
sysfsm_setup */
usleep(100*1000);
// create pseudofs
ret_ihklib = ihk_os_create_pseudofs(0, 0, 0);
fp = popen("cat /proc/mounts | grep /tmp/mcos/mcos0_sys", "r");
nread = fread(buf, 1, sizeof(buf), fp);
buf[nread] = 0;
//OKNG(ret_ihklib == 0 &&
// strstr(buf, "/tmp/mcos/mcos0_sys") != NULL, "ihk_os_create_pseudofs()\n");
// mcexec
sprintf(cmd, "%s/bin/mcexec ls -l | grep Makefile", prefix);
fp = popen(cmd, "r");
@ -140,12 +126,6 @@ destroy:
sprintf(cmd, "rmmod %s/kmod/mcctrl.ko", prefix);
status = system(cmd);
// destroy pseudofs
ret_ihklib = ihk_os_destroy_pseudofs(0, 0, 0);
fp = popen("cat /proc/mounts | grep /tmp/mcos/mcos0_sys", "r");
nread = fread(buf, 1, sizeof(buf), fp);
buf[nread] = 0;
sprintf(cmd, "rmmod %s/kmod/%s", prefix, PART_MOD_NAME);
status = system(cmd);

View File

@ -36,12 +36,6 @@ int main(int argc, char** argv) {
sprintf(cmd, "%s/sbin/mcstop+release.sh", prefix);
status = system(cmd);
// ihk_os_destroy_pseudofs
ret_ihklib = ihk_os_destroy_pseudofs(0, 0, 0);
fp = popen("cat /proc/mounts | grep /tmp/mcos/mcos0_sys", "r");
nread = fread(buf, 1, sizeof(buf), fp);
buf[nread] = 0;
sprintf(cmd, "insmod %s/kmod/ihk.ko", prefix);
status = system(cmd);
@ -105,14 +99,6 @@ int main(int argc, char** argv) {
sysfsm_setup */
usleep(100*1000);
// create pseudofs
ret_ihklib = ihk_os_create_pseudofs(0, 0, 0);
fp = popen("cat /proc/mounts | grep /tmp/mcos/mcos0_sys", "r");
nread = fread(buf, 1, sizeof(buf), fp);
buf[nread] = 0;
//OKNG(ret_ihklib == 0 &&
// strstr(buf, "/tmp/mcos/mcos0_sys") != NULL, "ihk_os_create_pseudofs()\n");
// mcexec
sprintf(cmd, "%s/bin/mcexec ls -l | grep Makefile", prefix);
fp = popen(cmd, "r");
@ -139,12 +125,6 @@ destroy:
sprintf(cmd, "rmmod %s/kmod/mcctrl.ko", prefix);
status = system(cmd);
// destroy pseudofs
ret_ihklib = ihk_os_destroy_pseudofs(0, 0, 0);
fp = popen("cat /proc/mounts | grep /tmp/mcos/mcos0_sys", "r");
nread = fread(buf, 1, sizeof(buf), fp);
buf[nread] = 0;
sprintf(cmd, "rmmod %s/kmod/%s", prefix, PART_MOD_NAME);
status = system(cmd);

View File

@ -36,12 +36,6 @@ int main(int argc, char** argv) {
sprintf(cmd, "%s/sbin/mcstop+release.sh", prefix);
status = system(cmd);
// ihk_os_destroy_pseudofs
ret_ihklib = ihk_os_destroy_pseudofs(0, 0, 0);
fp = popen("cat /proc/mounts | grep /tmp/mcos/mcos0_sys", "r");
nread = fread(buf, 1, sizeof(buf), fp);
buf[nread] = 0;
sprintf(cmd, "insmod %s/kmod/ihk.ko", prefix);
status = system(cmd);
@ -105,14 +99,6 @@ int main(int argc, char** argv) {
sysfsm_setup */
usleep(100*1000);
// create pseudofs
ret_ihklib = ihk_os_create_pseudofs(0, 0, 0);
fp = popen("cat /proc/mounts | grep /tmp/mcos/mcos0_sys", "r");
nread = fread(buf, 1, sizeof(buf), fp);
buf[nread] = 0;
//OKNG(ret_ihklib == 0 &&
// strstr(buf, "/tmp/mcos/mcos0_sys") != NULL, "ihk_os_create_pseudofs()\n");
// mcexec
sprintf(cmd, "%s/bin/mcexec ls -l | grep Makefile", prefix);
fp = popen(cmd, "r");
@ -140,12 +126,6 @@ destroy:
sprintf(cmd, "rmmod %s/kmod/mcctrl.ko", prefix);
status = system(cmd);
// destroy pseudofs
ret_ihklib = ihk_os_destroy_pseudofs(0, 0, 0);
fp = popen("cat /proc/mounts | grep /tmp/mcos/mcos0_sys", "r");
nread = fread(buf, 1, sizeof(buf), fp);
buf[nread] = 0;
sprintf(cmd, "rmmod %s/kmod/%s", prefix, PART_MOD_NAME);
status = system(cmd);

View File

@ -36,12 +36,6 @@ int main(int argc, char** argv) {
sprintf(cmd, "%s/sbin/mcstop+release.sh", prefix);
status = system(cmd);
// ihk_os_destroy_pseudofs
ret_ihklib = ihk_os_destroy_pseudofs(0, 0, 0);
fp = popen("cat /proc/mounts | grep /tmp/mcos/mcos0_sys", "r");
nread = fread(buf, 1, sizeof(buf), fp);
buf[nread] = 0;
sprintf(cmd, "insmod %s/kmod/ihk.ko", prefix);
status = system(cmd);
@ -105,14 +99,6 @@ int main(int argc, char** argv) {
sysfsm_setup */
usleep(100*1000);
// create pseudofs
ret_ihklib = ihk_os_create_pseudofs(0, 0, 0);
fp = popen("cat /proc/mounts | grep /tmp/mcos/mcos0_sys", "r");
nread = fread(buf, 1, sizeof(buf), fp);
buf[nread] = 0;
//OKNG(ret_ihklib == 0 &&
// strstr(buf, "/tmp/mcos/mcos0_sys") != NULL, "ihk_os_create_pseudofs()\n");
// mcexec
pid = fork();
if (pid == 0) {
@ -147,12 +133,6 @@ destroy:
sprintf(cmd, "rmmod %s/kmod/mcctrl.ko", prefix);
status = system(cmd);
// destroy pseudofs
ret_ihklib = ihk_os_destroy_pseudofs(0, 0, 0);
fp = popen("cat /proc/mounts | grep /tmp/mcos/mcos0_sys", "r");
nread = fread(buf, 1, sizeof(buf), fp);
buf[nread] = 0;
sprintf(cmd, "rmmod %s/kmod/%s", prefix, PART_MOD_NAME);
status = system(cmd);

View File

@ -36,12 +36,6 @@ int main(int argc, char** argv) {
sprintf(cmd, "%s/sbin/mcstop+release.sh", prefix);
status = system(cmd);
// ihk_os_destroy_pseudofs
ret_ihklib = ihk_os_destroy_pseudofs(0, 0, 0);
fp = popen("cat /proc/mounts | grep /tmp/mcos/mcos0_sys", "r");
nread = fread(buf, 1, sizeof(buf), fp);
buf[nread] = 0;
sprintf(cmd, "insmod %s/kmod/ihk.ko", prefix);
status = system(cmd);
@ -105,14 +99,6 @@ int main(int argc, char** argv) {
sysfsm_setup */
usleep(100*1000);
// create pseudofs
ret_ihklib = ihk_os_create_pseudofs(0, 0, 0);
fp = popen("cat /proc/mounts | grep /tmp/mcos/mcos0_sys", "r");
nread = fread(buf, 1, sizeof(buf), fp);
buf[nread] = 0;
//OKNG(ret_ihklib == 0 &&
// strstr(buf, "/tmp/mcos/mcos0_sys") != NULL, "ihk_os_create_pseudofs()\n");
// mcexec
fflush(stdout);
pid = fork();
@ -151,12 +137,6 @@ destroy:
sprintf(cmd, "rmmod %s/kmod/mcctrl.ko", prefix);
status = system(cmd);
// destroy pseudofs
ret_ihklib = ihk_os_destroy_pseudofs(0, 0, 0);
fp = popen("cat /proc/mounts | grep /tmp/mcos/mcos0_sys", "r");
nread = fread(buf, 1, sizeof(buf), fp);
buf[nread] = 0;
sprintf(cmd, "rmmod %s/kmod/%s", prefix, PART_MOD_NAME);
status = system(cmd);

View File

@ -36,12 +36,6 @@ int main(int argc, char** argv) {
sprintf(cmd, "%s/sbin/mcstop+release.sh", prefix);
status = system(cmd);
// ihk_os_destroy_pseudofs
ret_ihklib = ihk_os_destroy_pseudofs(0, 0, 0);
fp = popen("cat /proc/mounts | grep /tmp/mcos/mcos0_sys", "r");
nread = fread(buf, 1, sizeof(buf), fp);
buf[nread] = 0;
sprintf(cmd, "insmod %s/kmod/ihk.ko", prefix);
status = system(cmd);
@ -106,14 +100,6 @@ goto shutdown;
sysfsm_setup */
usleep(100*1000);
// create pseudofs
ret_ihklib = ihk_os_create_pseudofs(0, 0, 0);
fp = popen("cat /proc/mounts | grep /tmp/mcos/mcos0_sys", "r");
nread = fread(buf, 1, sizeof(buf), fp);
buf[nread] = 0;
//OKNG(ret_ihklib == 0 &&
// strstr(buf, "/tmp/mcos/mcos0_sys") != NULL, "ihk_os_create_pseudofs()\n");
// mcexec
sprintf(cmd, "%s/bin/mcexec ls -l | grep Makefile", prefix);
fp = popen(cmd, "r");
@ -140,12 +126,6 @@ destroy:
sprintf(cmd, "rmmod %s/kmod/mcctrl.ko", prefix);
status = system(cmd);
// destroy pseudofs
ret_ihklib = ihk_os_destroy_pseudofs(0, 0, 0);
fp = popen("cat /proc/mounts | grep /tmp/mcos/mcos0_sys", "r");
nread = fread(buf, 1, sizeof(buf), fp);
buf[nread] = 0;
sprintf(cmd, "rmmod %s/kmod/%s", prefix, PART_MOD_NAME);
status = system(cmd);

View File

@ -36,12 +36,6 @@ int main(int argc, char** argv) {
sprintf(cmd, "%s/sbin/mcstop+release.sh", prefix);
status = system(cmd);
// ihk_os_destroy_pseudofs
ret_ihklib = ihk_os_destroy_pseudofs(0, 0, 0);
fp = popen("cat /proc/mounts | grep /tmp/mcos/mcos0_sys", "r");
nread = fread(buf, 1, sizeof(buf), fp);
buf[nread] = 0;
sprintf(cmd, "insmod %s/kmod/ihk.ko", prefix);
status = system(cmd);
@ -105,14 +99,6 @@ int main(int argc, char** argv) {
sysfsm_setup */
usleep(100*1000);
// create pseudofs
ret_ihklib = ihk_os_create_pseudofs(0, 0, 0);
fp = popen("cat /proc/mounts | grep /tmp/mcos/mcos0_sys", "r");
nread = fread(buf, 1, sizeof(buf), fp);
buf[nread] = 0;
//OKNG(ret_ihklib == 0 &&
// strstr(buf, "/tmp/mcos/mcos0_sys") != NULL, "ihk_os_create_pseudofs()\n");
// mcexec
sprintf(cmd, "%s/bin/mcexec ls -l | grep Makefile", prefix);
fp = popen(cmd, "r");
@ -143,12 +129,6 @@ destroy:
sprintf(cmd, "rmmod %s/kmod/mcctrl.ko", prefix);
status = system(cmd);
// destroy pseudofs
ret_ihklib = ihk_os_destroy_pseudofs(0, 0, 0);
fp = popen("cat /proc/mounts | grep /tmp/mcos/mcos0_sys", "r");
nread = fread(buf, 1, sizeof(buf), fp);
buf[nread] = 0;
sprintf(cmd, "rmmod %s/kmod/%s", prefix, PART_MOD_NAME);
status = system(cmd);

View File

@ -36,12 +36,6 @@ int main(int argc, char** argv) {
sprintf(cmd, "%s/sbin/mcstop+release.sh", prefix);
status = system(cmd);
// ihk_os_destroy_pseudofs
ret_ihklib = ihk_os_destroy_pseudofs(0, 0, 0);
fp = popen("cat /proc/mounts | grep /tmp/mcos/mcos0_sys", "r");
nread = fread(buf, 1, sizeof(buf), fp);
buf[nread] = 0;
sprintf(cmd, "insmod %s/kmod/ihk.ko", prefix);
status = system(cmd);
@ -106,14 +100,6 @@ goto shutdown;
sysfsm_setup */
usleep(100*1000);
// create pseudofs
ret_ihklib = ihk_os_create_pseudofs(0, 0, 0);
fp = popen("cat /proc/mounts | grep /tmp/mcos/mcos0_sys", "r");
nread = fread(buf, 1, sizeof(buf), fp);
buf[nread] = 0;
//OKNG(ret_ihklib == 0 &&
// strstr(buf, "/tmp/mcos/mcos0_sys") != NULL, "ihk_os_create_pseudofs()\n");
// mcexec
sprintf(cmd, "%s/bin/mcexec ls -l | grep Makefile", prefix);
fp = popen(cmd, "r");
@ -140,12 +126,6 @@ destroy:
sprintf(cmd, "rmmod %s/kmod/mcctrl.ko", prefix);
status = system(cmd);
// destroy pseudofs
ret_ihklib = ihk_os_destroy_pseudofs(0, 0, 0);
fp = popen("cat /proc/mounts | grep /tmp/mcos/mcos0_sys", "r");
nread = fread(buf, 1, sizeof(buf), fp);
buf[nread] = 0;
sprintf(cmd, "rmmod %s/kmod/%s", prefix, PART_MOD_NAME);
status = system(cmd);

View File

@ -85,17 +85,6 @@ int main(int argc, char **argv)
printf("Execute as a root\n");
}
#if 0
// ihk_os_destroy_pseudofs
ret = ihk_os_destroy_pseudofs(0, 0, 0);
fp = popen("cat /proc/mounts | grep /tmp/mcos/mcos0_sys", "r");
nread = fread(buf, 1, sizeof(buf), fp);
buf[nread] = 0;
OKNG(ret == 0 &&
strstr(buf, "/tmp/mcos/mcos0_sys") == NULL,
"ihk_os_destroy_pseudofs (1)\n");
#endif
/* Test error handling */
// reserve cpu
@ -411,10 +400,6 @@ int main(int argc, char **argv)
OKNG(strstr(buf, "rror") != NULL,
"ihkconfig 0 get status (1) returned:\n%s\n", buf);
// create pseudofs
ret = ihk_os_create_pseudofs(0, 0, 0);
OKNG(ret != 0, "ihk_os_create_pseudofs\n");
// kmsg size
kmsg_size = ihk_os_get_kmsg_size(0);
OKNG(kmsg_size < 0, "ihk_os_get_kmsg_size\n");
@ -455,11 +440,6 @@ int main(int argc, char **argv)
ret = ihk_destroy_os(0, 0);
OKNG(ret != 0, "ihk_destroy_os (2)\n");
// destroy pseudofs. Note that it doesn't check the existence
// of the OS.
ret = ihk_os_destroy_pseudofs(0, 0, 0);
OKNG(ret == 0, "ihk_os_destroy_pseudofs (2)\n");
/* Expected to succeed */
// create 0
@ -731,17 +711,6 @@ int main(int argc, char **argv)
OKNG(strstr(buf, "RUNNING") != NULL,
"ihkconfig 0 get status (4) returned:\n%s\n", buf);
#if 0
// create pseudofs
ret = ihk_os_create_pseudofs(0, 0, 0);
fp = popen("cat /proc/mounts | grep /tmp/mcos/mcos0_sys", "r");
nread = fread(buf, 1, sizeof(buf), fp);
buf[nread] = 0;
OKNG(ret == 0 &&
strstr(buf, "/tmp/mcos/mcos0_sys") != NULL,
"ihk_os_create_pseudofs()\n");
#endif
// get kmsg size
kmsg_size = ihk_os_get_kmsg_size(0);
OKNG(kmsg_size > 0, "ihk_os_get_kmsg_size\n");
@ -866,15 +835,6 @@ int main(int argc, char **argv)
status = system(cmd);
CHKANDJUMP(WEXITSTATUS(status) != 0, -1, "system");
// destroy pseudofs
ret = ihk_os_destroy_pseudofs(0, 0, 0);
fp = popen("cat /proc/mounts | grep /tmp/mcos/mcos0_sys", "r");
nread = fread(buf, 1, sizeof(buf), fp);
buf[nread] = 0;
OKNG(ret == 0 &&
strstr(buf, "/tmp/mcos/mcos0_sys") == NULL,
"ihk_os_destroy_pseudofs (3)\n");
sprintf(cmd, "rmmod %s/kmod/ihk-smp-%s.ko",
MCK_DIR, ARCH);
status = system(cmd);