diff --git a/src/test/rpmem_basic/TEST15 b/src/test/rpmem_basic/TEST15 index 6ec93890516829dc85d8b45a4bae2c0ce97aa4b1..991a388effc6d9876266d8529743ccbc46a547b5 100755 --- a/src/test/rpmem_basic/TEST15 +++ b/src/test/rpmem_basic/TEST15 @@ -1,6 +1,6 @@ #!/usr/bin/env bash # -# Copyright 2016-2018, Intel Corporation +# Copyright 2016-2019, Intel Corporation # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions @@ -62,7 +62,7 @@ create_poolset $DIR/pool2.set AUTO:$(get_node_devdax_path 0 0) O NOHDRS expect_normal_exit run_on_node 0 rm -rf $PART_DIR expect_normal_exit run_on_node 0 mkdir -p ${RPMEM_POOLSET_DIR[0]} expect_normal_exit run_on_node 0 mkdir -p $PART_DIR -expect_normal_exit copy_files_to_node 0 ${RPMEM_POOLSET_DIR[0]} $DIR/{pool0.set,pool1.set,pool2.set} +copy_files_to_node 0 ${RPMEM_POOLSET_DIR[0]} $DIR/{pool0.set,pool1.set,pool2.set} expect_normal_exit run_on_node 0 ../pmempool rm -sf ${RPMEM_POOLSET_DIR[0]}/{pool0.set,pool1.set,pool2.set} expect_normal_exit run_on_node 1 ../pmempool rm -sf $(get_node_devdax_path 0 0) diff --git a/src/test/rpmem_basic/TEST18 b/src/test/rpmem_basic/TEST18 index 1d6ca99e741d7493c9b25471ddcf1c72492cdfb7..05322cd0e095d616cada864581b2532763803fe6 100755 --- a/src/test/rpmem_basic/TEST18 +++ b/src/test/rpmem_basic/TEST18 @@ -1,6 +1,6 @@ #!/usr/bin/env bash # -# Copyright 2016-2018, Intel Corporation +# Copyright 2016-2019, Intel Corporation # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions @@ -63,7 +63,7 @@ create_poolset $DIR/pool2.set AUTO:$(get_node_devdax_path 0 0) O NOHDRS expect_normal_exit run_on_node 0 rm -rf $PART_DIR expect_normal_exit run_on_node 0 mkdir -p ${RPMEM_POOLSET_DIR[0]} expect_normal_exit run_on_node 0 mkdir -p $PART_DIR -expect_normal_exit copy_files_to_node 0 ${RPMEM_POOLSET_DIR[0]} $DIR/{pool0.set,pool1.set,pool2.set} +copy_files_to_node 0 ${RPMEM_POOLSET_DIR[0]} $DIR/{pool0.set,pool1.set,pool2.set} expect_normal_exit run_on_node 0 ../pmempool rm -sf ${RPMEM_POOLSET_DIR[0]}/{pool0.set,pool1.set,pool2.set} expect_normal_exit run_on_node 1 ../pmempool rm -sf $(get_node_devdax_path 0 0) diff --git a/src/test/rpmem_basic/TEST5 b/src/test/rpmem_basic/TEST5 index d99a897fbad4458e5863c64ba6c964e39a83dc03..371b60d2f5cbe6ffda33cb72ec90ac82ddb297d2 100755 --- a/src/test/rpmem_basic/TEST5 +++ b/src/test/rpmem_basic/TEST5 @@ -1,6 +1,6 @@ #!/usr/bin/env bash # -# Copyright 2016-2018, Intel Corporation +# Copyright 2016-2019, Intel Corporation # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions @@ -59,7 +59,7 @@ create_poolset $DIR/pool2.set 8M:$PART_DIR/pool2.part0 8M:$PART_DIR/pool2.part1 expect_normal_exit run_on_node 0 rm -rf $PART_DIR expect_normal_exit run_on_node 0 mkdir -p ${RPMEM_POOLSET_DIR[0]} expect_normal_exit run_on_node 0 mkdir -p $PART_DIR -expect_normal_exit copy_files_to_node 0 ${RPMEM_POOLSET_DIR[0]} $DIR/{pool0.set,pool1.set,pool2.set} +copy_files_to_node 0 ${RPMEM_POOLSET_DIR[0]} $DIR/{pool0.set,pool1.set,pool2.set} expect_abnormal_exit run_on_node 1 ssh ${NODE_ADDR[0]} "\$RPMEM_CMD --remove pool0.set" expect_abnormal_exit run_on_node 1 ssh ${NODE_ADDR[0]} "\$RPMEM_CMD --remove pool1.set" diff --git a/src/test/rpmem_basic/TEST6 b/src/test/rpmem_basic/TEST6 index a6be71a5d97bedf3ce5932caad540ed32181260c..f49f426b36065e31954ccfac5ce02515488b8e6b 100755 --- a/src/test/rpmem_basic/TEST6 +++ b/src/test/rpmem_basic/TEST6 @@ -1,6 +1,6 @@ #!/usr/bin/env bash # -# Copyright 2016-2018, Intel Corporation +# Copyright 2016-2019, Intel Corporation # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions @@ -59,7 +59,7 @@ create_poolset $DIR/pool2.set 8M:$PART_DIR/pool2.part0 8M:$PART_DIR/pool2.part1 expect_normal_exit run_on_node 0 rm -rf $PART_DIR expect_normal_exit run_on_node 0 mkdir -p ${RPMEM_POOLSET_DIR[0]} expect_normal_exit run_on_node 0 mkdir -p $PART_DIR -expect_normal_exit copy_files_to_node 0 ${RPMEM_POOLSET_DIR[0]} $DIR/{pool0.set,pool1.set,pool2.set} +copy_files_to_node 0 ${RPMEM_POOLSET_DIR[0]} $DIR/{pool0.set,pool1.set,pool2.set} expect_abnormal_exit run_on_node 1 ssh ${NODE_ADDR[0]} "\$RPMEM_CMD --remove pool0.set" expect_abnormal_exit run_on_node 1 ssh ${NODE_ADDR[0]} "\$RPMEM_CMD --remove pool1.set" diff --git a/src/test/rpmem_basic/TEST7 b/src/test/rpmem_basic/TEST7 index b2cf9e3e957b9f45607ceed96c0c993432bc1c02..4b9c6117c82c7868babe7ba232dc5108907a6e37 100755 --- a/src/test/rpmem_basic/TEST7 +++ b/src/test/rpmem_basic/TEST7 @@ -1,6 +1,6 @@ #!/usr/bin/env bash # -# Copyright 2016-2018, Intel Corporation +# Copyright 2016-2019, Intel Corporation # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions @@ -63,7 +63,7 @@ create_poolset $DIR/pool2.set AUTO:$(get_node_devdax_path 0 0) O NOHDRS expect_normal_exit run_on_node 0 rm -rf $PART_DIR expect_normal_exit run_on_node 0 mkdir -p ${RPMEM_POOLSET_DIR[0]} expect_normal_exit run_on_node 0 mkdir -p $PART_DIR -expect_normal_exit copy_files_to_node 0 ${RPMEM_POOLSET_DIR[0]} $DIR/{pool0.set,pool1.set,pool2.set} +copy_files_to_node 0 ${RPMEM_POOLSET_DIR[0]} $DIR/{pool0.set,pool1.set,pool2.set} expect_normal_exit run_on_node 0 ../pmempool rm -sf ${RPMEM_POOLSET_DIR[0]}/{pool0.set,pool1.set,pool2.set} expect_normal_exit run_on_node 1 ../pmempool rm -sf $(get_node_devdax_path 0 0)