Skip to content
Snippets Groups Projects
Commit 34838f31 authored by Jan M Michalski's avatar Jan M Michalski
Browse files

test: fix obj_rpmem_heap_interrupt

- kill rpmemd prior to calling pmempool rm
parent 4d5c6d17
No related branches found
No related tags found
No related merge requests found
#!/usr/bin/env bash #!/usr/bin/env bash
# #
# Copyright 2016-2018, Intel Corporation # Copyright 2016-2019, Intel Corporation
# Copyright (c) 2016, Microsoft Corporation. All rights reserved. # Copyright (c) 2016, Microsoft Corporation. All rights reserved.
# #
# Redistribution and use in source and binary forms, with or without # Redistribution and use in source and binary forms, with or without
...@@ -51,7 +51,8 @@ require_nodes 2 ...@@ -51,7 +51,8 @@ require_nodes 2
require_node_libfabric 0 $RPMEM_PROVIDER require_node_libfabric 0 $RPMEM_PROVIDER
require_node_libfabric 1 $RPMEM_PROVIDER require_node_libfabric 1 $RPMEM_PROVIDER
init_rpmem_on_node 1 0 PID_FILE=rpmemd.pid
init_rpmem_on_node 1 0:$PID_FILE
# binary for this test # binary for this test
EXE=obj_heap_interrupt EXE=obj_heap_interrupt
...@@ -81,7 +82,12 @@ create_holey_file_on_node 0 9M ${NODE_DIR[0]}$TEST_FILE_REMOTE ...@@ -81,7 +82,12 @@ create_holey_file_on_node 0 9M ${NODE_DIR[0]}$TEST_FILE_REMOTE
# execute test # execute test
expect_normal_exit run_on_node 1 ./$EXE$EXESUFFIX ${NODE_DIR[1]}$TEST_SET_LOCAL c 0 expect_normal_exit run_on_node 1 ./$EXE$EXESUFFIX ${NODE_DIR[1]}$TEST_SET_LOCAL c 0
# pmempool rm expects flock from the remote parts are released otherwise it will
# fail to delete them so it has to wait for rpmemd to exit
expect_abnormal_exit wait_on_node 0 $PID_FILE
expect_normal_exit run_on_node 1 ../pmempool rm -sf ${NODE_DIR[1]}$TEST_SET_LOCAL expect_normal_exit run_on_node 1 ../pmempool rm -sf ${NODE_DIR[1]}$TEST_SET_LOCAL
expect_normal_exit run_on_node 1 ../pmempool create --layout heap_interrupt obj ${NODE_DIR[1]}$TEST_SET_LOCAL expect_normal_exit run_on_node 1 ../pmempool create --layout heap_interrupt obj ${NODE_DIR[1]}$TEST_SET_LOCAL
expect_normal_exit run_on_node 1 ./$EXE$EXESUFFIX ${NODE_DIR[1]}$TEST_SET_LOCAL o 0 expect_normal_exit run_on_node 1 ./$EXE$EXESUFFIX ${NODE_DIR[1]}$TEST_SET_LOCAL o 0
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment