Skip to contentSkip to conversation

fs_bind: Convert to ltp tests

PATCH New Joerg Vehlow 2 participants 7 messages Jul 5, 2021 – Jul 6, 2021

lore
Share & tools
lore
#0 lore raw

cover fs_bind: Convert to ltp tests

Hi everyone,

I know this is a huge changeset, but there is not really a good way to break it down into multiple commits. Every step in between would either lead to a broken test suite or a change, that is then changed again. So I made this one huge commit, that converts all of the tests of the testsuite in one go.

I added some minor bugfixes especially added umounts, because some where missing and some were redundant. I also dropped all useless output (bare ls).

I may have overused EXPECT_PASS a bit here, but I think it does not do any harm, if all mounts are checked.

Joerg

#1 lore raw

PATCH 1/1 fs_bind: Convert to ltp tests

From: Joerg Vehlow <[email protected]>

This patchset converts all fs_bind tests to individual ltp tests. The test functionality is basically unchanged, just converted to use a library instead of a testrunner script and several binaries and shell scripts.

The tool smount is dropped. It should not be required anymore, because it just emulates mount's --make-{shared,private,...}, which should be supported by most mount implementation nowadays.

Every test now also verifies, if the expected mounts exist, by unmounting all expected mountpoints in the end and the library code makes sure, no unexpected mountpoints remain.

The cloneNS tests are now also executed and working. The test code is now fully contained in the fs_bind_cloneNS*.sh files, instead of three files for test, parent and child and some wonky synchronization. The three files contained code, that was executed before creating the new mount namespace, in the parent process and in the child process. The code in parent and child process had some synchronization points before. Using ns_create and ns_exec no snychronization is required anymore, because code can be executed arbitrarily in the parent or child namespace.

The test code uses only 3 actions:
- mount (fs_bind_makedir is also a mount)
- fs_bind_check to compare directory trees
- umount
The cloneNS tests additionally create a mount namespace and run some of the command inside this namespace.

---
 runtest/fs_bind                               | 106 +++-
 testcases/kernel/fs/fs_bind/.gitignore        |   2 -
 testcases/kernel/fs/fs_bind/BUGS              |   5 -
 testcases/kernel/fs/fs_bind/CHANGELOG         |  84 ---
 testcases/kernel/fs/fs_bind/Makefile          |  28 +-
 testcases/kernel/fs/fs_bind/README            | 165 ------
 testcases/kernel/fs/fs_bind/TODO              |  11 -
 testcases/kernel/fs/fs_bind/bin/Makefile      |  31 --
 testcases/kernel/fs/fs_bind/bin/check_prop    |  73 ---
 testcases/kernel/fs/fs_bind/bin/lockfile      |  84 ---
 testcases/kernel/fs/fs_bind/bin/makedir       | 101 ----
 testcases/kernel/fs/fs_bind/bin/nsclone.c     |  68 ---
 testcases/kernel/fs/fs_bind/bin/setup         | 104 ----
 testcases/kernel/fs/fs_bind/bin/setupnslock   |  64 ---
 testcases/kernel/fs/fs_bind/bin/smount.c      |  73 ---
 .../fs/fs_bind/bind/00_Descriptions.txt       | 176 ------
 testcases/kernel/fs/fs_bind/bind/Makefile     |  11 +
 testcases/kernel/fs/fs_bind/bind/fs_bind01.sh |  48 ++
 testcases/kernel/fs/fs_bind/bind/fs_bind02.sh |  50 ++
 testcases/kernel/fs/fs_bind/bind/fs_bind03.sh |  61 ++
 testcases/kernel/fs/fs_bind/bind/fs_bind04.sh |  50 ++
 testcases/kernel/fs/fs_bind/bind/fs_bind05.sh |  58 ++
 testcases/kernel/fs/fs_bind/bind/fs_bind06.sh |  47 ++
 .../kernel/fs/fs_bind/bind/fs_bind07-2.sh     |  34 ++
 testcases/kernel/fs/fs_bind/bind/fs_bind07.sh |  57 ++
 testcases/kernel/fs/fs_bind/bind/fs_bind08.sh |  48 ++
 testcases/kernel/fs/fs_bind/bind/fs_bind09.sh |  57 ++
 testcases/kernel/fs/fs_bind/bind/fs_bind10.sh |  52 ++
 testcases/kernel/fs/fs_bind/bind/fs_bind11.sh |  63 +++
 testcases/kernel/fs/fs_bind/bind/fs_bind12.sh |  52 ++
 testcases/kernel/fs/fs_bind/bind/fs_bind13.sh |  38 ++
 testcases/kernel/fs/fs_bind/bind/fs_bind14.sh |  34 ++
 testcases/kernel/fs/fs_bind/bind/fs_bind15.sh |  43 ++
 testcases/kernel/fs/fs_bind/bind/fs_bind16.sh |  35 ++
 testcases/kernel/fs/fs_bind/bind/fs_bind17.sh |  48 ++
 testcases/kernel/fs/fs_bind/bind/fs_bind18.sh |  48 ++
 testcases/kernel/fs/fs_bind/bind/fs_bind19.sh |  52 ++
 testcases/kernel/fs/fs_bind/bind/fs_bind20.sh |  48 ++
 testcases/kernel/fs/fs_bind/bind/fs_bind21.sh |  57 ++
 testcases/kernel/fs/fs_bind/bind/fs_bind22.sh |  40 ++
 testcases/kernel/fs/fs_bind/bind/fs_bind23.sh |  40 ++
 testcases/kernel/fs/fs_bind/bind/fs_bind24.sh |  35 ++
 testcases/kernel/fs/fs_bind/bind/test01       |  99 ----
 testcases/kernel/fs/fs_bind/bind/test02       | 102 ----
 testcases/kernel/fs/fs_bind/bind/test03       | 118 ----
 testcases/kernel/fs/fs_bind/bind/test04       | 104 ----
 testcases/kernel/fs/fs_bind/bind/test05       | 113 ----
 testcases/kernel/fs/fs_bind/bind/test06       | 102 ----
 testcases/kernel/fs/fs_bind/bind/test07       | 113 ----
 testcases/kernel/fs/fs_bind/bind/test07-2     |  69 ---
 testcases/kernel/fs/fs_bind/bind/test08       | 102 ----
 testcases/kernel/fs/fs_bind/bind/test09       | 113 ----
 testcases/kernel/fs/fs_bind/bind/test10       | 108 ----
 testcases/kernel/fs/fs_bind/bind/test11       | 116 ----
 testcases/kernel/fs/fs_bind/bind/test12       | 108 ----
 testcases/kernel/fs/fs_bind/bind/test13       |  90 ---
 testcases/kernel/fs/fs_bind/bind/test14       |  86 ---
 testcases/kernel/fs/fs_bind/bind/test15       |  96 ----
 testcases/kernel/fs/fs_bind/bind/test16       |  87 ---
 testcases/kernel/fs/fs_bind/bind/test17       | 100 ----
 testcases/kernel/fs/fs_bind/bind/test18       |  98 ----
 testcases/kernel/fs/fs_bind/bind/test19       | 109 ----
 testcases/kernel/fs/fs_bind/bind/test20       |  98 ----
 testcases/kernel/fs/fs_bind/bind/test21       | 114 ----
 testcases/kernel/fs/fs_bind/bind/test22       |  95 ----
 testcases/kernel/fs/fs_bind/bind/test23       |  89 ---
 testcases/kernel/fs/fs_bind/bind/test24       |  87 ---
 .../fs/fs_bind/cloneNS/00_Descriptions.txt    |  70 ---
 testcases/kernel/fs/fs_bind/cloneNS/Makefile  |  11 +
 testcases/kernel/fs/fs_bind/cloneNS/child01   |  34 --
 testcases/kernel/fs/fs_bind/cloneNS/child02   |  42 --
 testcases/kernel/fs/fs_bind/cloneNS/child03   |  32 --
 testcases/kernel/fs/fs_bind/cloneNS/child04   |  33 --
 testcases/kernel/fs/fs_bind/cloneNS/child05   |  41 --
 testcases/kernel/fs/fs_bind/cloneNS/child06   |  49 --
 testcases/kernel/fs/fs_bind/cloneNS/child07   |  42 --
 .../fs/fs_bind/cloneNS/fs_bind_cloneNS01.sh   |  38 ++
 .../fs/fs_bind/cloneNS/fs_bind_cloneNS02.sh   |  53 ++
 .../fs/fs_bind/cloneNS/fs_bind_cloneNS03.sh   |  27 +
 .../fs/fs_bind/cloneNS/fs_bind_cloneNS04.sh   |  31 ++
 .../fs/fs_bind/cloneNS/fs_bind_cloneNS05.sh   |  55 ++
 .../fs/fs_bind/cloneNS/fs_bind_cloneNS06.sh   |  77 +++
 .../fs/fs_bind/cloneNS/fs_bind_cloneNS07.sh   |  55 ++
 testcases/kernel/fs/fs_bind/cloneNS/parent01  |  44 --
 testcases/kernel/fs/fs_bind/cloneNS/parent02  |  45 --
 testcases/kernel/fs/fs_bind/cloneNS/parent03  |  34 --
 testcases/kernel/fs/fs_bind/cloneNS/parent04  |  37 --
 testcases/kernel/fs/fs_bind/cloneNS/parent05  |  45 --
 testcases/kernel/fs/fs_bind/cloneNS/parent06  |  51 --
 testcases/kernel/fs/fs_bind/cloneNS/parent07  |  48 --
 testcases/kernel/fs/fs_bind/cloneNS/test01    |  85 ---
 testcases/kernel/fs/fs_bind/cloneNS/test02    |  85 ---
 testcases/kernel/fs/fs_bind/cloneNS/test03    |  77 ---
 testcases/kernel/fs/fs_bind/cloneNS/test04    |  78 ---
 testcases/kernel/fs/fs_bind/cloneNS/test05    |  90 ---
 testcases/kernel/fs/fs_bind/cloneNS/test06    |  96 ----
 testcases/kernel/fs/fs_bind/cloneNS/test07    |  91 ---
 testcases/kernel/fs/fs_bind/fs_bind_lib.sh    | 246 ++++++++
 .../kernel/fs/fs_bind/fs_bind_regression.sh   |  56 ++
 .../fs/fs_bind/move/00_Descriptions.txt       | 158 ------
 testcases/kernel/fs/fs_bind/move/Makefile     |  11 +
 .../kernel/fs/fs_bind/move/fs_bind_move01.sh  |  44 ++
 .../kernel/fs/fs_bind/move/fs_bind_move02.sh  |  45 ++
 .../kernel/fs/fs_bind/move/fs_bind_move03.sh  |  47 ++
 .../kernel/fs/fs_bind/move/fs_bind_move04.sh  |  41 ++
 .../kernel/fs/fs_bind/move/fs_bind_move05.sh  |  44 ++
 .../kernel/fs/fs_bind/move/fs_bind_move06.sh  |  40 ++
 .../kernel/fs/fs_bind/move/fs_bind_move07.sh  |  41 ++
 .../kernel/fs/fs_bind/move/fs_bind_move08.sh  |  35 ++
 .../kernel/fs/fs_bind/move/fs_bind_move09.sh  |  50 ++
 .../kernel/fs/fs_bind/move/fs_bind_move10.sh  |  46 ++
 .../kernel/fs/fs_bind/move/fs_bind_move11.sh  |  47 ++
 .../kernel/fs/fs_bind/move/fs_bind_move12.sh  |  45 ++
 .../kernel/fs/fs_bind/move/fs_bind_move13.sh  |  30 +
 .../kernel/fs/fs_bind/move/fs_bind_move14.sh  |  32 ++
 .../kernel/fs/fs_bind/move/fs_bind_move15.sh  |  32 ++
 .../kernel/fs/fs_bind/move/fs_bind_move16.sh  |  29 +
 .../kernel/fs/fs_bind/move/fs_bind_move17.sh  |  27 +
 .../kernel/fs/fs_bind/move/fs_bind_move18.sh  |  47 ++
 .../kernel/fs/fs_bind/move/fs_bind_move19.sh  |  47 ++
 .../kernel/fs/fs_bind/move/fs_bind_move20.sh  |  31 ++
 .../kernel/fs/fs_bind/move/fs_bind_move21.sh  |  44 ++
 .../kernel/fs/fs_bind/move/fs_bind_move22.sh  |  37 ++
 testcases/kernel/fs/fs_bind/move/test01       |  93 ----
 testcases/kernel/fs/fs_bind/move/test02       |  94 ----
 testcases/kernel/fs/fs_bind/move/test03       |  97 ----
 testcases/kernel/fs/fs_bind/move/test04       |  89 ---
 testcases/kernel/fs/fs_bind/move/test05       |  94 ----
 testcases/kernel/fs/fs_bind/move/test06       |  88 ---
 testcases/kernel/fs/fs_bind/move/test07       |  91 ---
 testcases/kernel/fs/fs_bind/move/test08       |  85 ---
 testcases/kernel/fs/fs_bind/move/test09       |  99 ----
 testcases/kernel/fs/fs_bind/move/test10       | 100 ----
 testcases/kernel/fs/fs_bind/move/test11       |  98 ----
 testcases/kernel/fs/fs_bind/move/test12       |  98 ----
 testcases/kernel/fs/fs_bind/move/test13       |  80 ---
 testcases/kernel/fs/fs_bind/move/test14       |  82 ---
 testcases/kernel/fs/fs_bind/move/test15       |  82 ---
 testcases/kernel/fs/fs_bind/move/test16       |  80 ---
 testcases/kernel/fs/fs_bind/move/test17       |  77 ---
 testcases/kernel/fs/fs_bind/move/test18       | 101 ----
 testcases/kernel/fs/fs_bind/move/test19       |  95 ----
 testcases/kernel/fs/fs_bind/move/test20       |  79 ---
 testcases/kernel/fs/fs_bind/move/test21       |  93 ----
 testcases/kernel/fs/fs_bind/move/test22       |  87 ---
 .../fs/fs_bind/rbind/00_Descriptions.txt      | 266 ---------
 testcases/kernel/fs/fs_bind/rbind/Makefile    |  11 +
 .../fs/fs_bind/rbind/fs_bind_rbind01.sh       |  50 ++
 .../fs/fs_bind/rbind/fs_bind_rbind02.sh       |  50 ++
 .../fs/fs_bind/rbind/fs_bind_rbind03.sh       |  61 ++
 .../fs/fs_bind/rbind/fs_bind_rbind04.sh       |  52 ++
 .../fs/fs_bind/rbind/fs_bind_rbind05.sh       |  62 +++
 .../fs/fs_bind/rbind/fs_bind_rbind06.sh       |  52 ++
 .../fs/fs_bind/rbind/fs_bind_rbind07-2.sh     |  37 ++
 .../fs/fs_bind/rbind/fs_bind_rbind07.sh       |  62 +++
 .../fs/fs_bind/rbind/fs_bind_rbind08.sh       |  52 ++
 .../fs/fs_bind/rbind/fs_bind_rbind09.sh       |  63 +++
 .../fs/fs_bind/rbind/fs_bind_rbind10.sh       |  58 ++
 .../fs/fs_bind/rbind/fs_bind_rbind11.sh       |  68 +++
 .../fs/fs_bind/rbind/fs_bind_rbind12.sh       |  58 ++
 .../fs/fs_bind/rbind/fs_bind_rbind13.sh       |  39 ++
 .../fs/fs_bind/rbind/fs_bind_rbind14.sh       |  35 ++
 .../fs/fs_bind/rbind/fs_bind_rbind15.sh       |  45 ++
 .../fs/fs_bind/rbind/fs_bind_rbind16.sh       |  36 ++
 .../fs/fs_bind/rbind/fs_bind_rbind17.sh       |  50 ++
 .../fs/fs_bind/rbind/fs_bind_rbind18.sh       |  50 ++
 .../fs/fs_bind/rbind/fs_bind_rbind19.sh       |  53 ++
 .../fs/fs_bind/rbind/fs_bind_rbind20.sh       |  50 ++
 .../fs/fs_bind/rbind/fs_bind_rbind21.sh       |  56 ++
 .../fs/fs_bind/rbind/fs_bind_rbind22.sh       |  49 ++
 .../fs/fs_bind/rbind/fs_bind_rbind23.sh       |  49 ++
 .../fs/fs_bind/rbind/fs_bind_rbind24.sh       |  49 ++
 .../fs/fs_bind/rbind/fs_bind_rbind25.sh       |  56 ++
 .../fs/fs_bind/rbind/fs_bind_rbind26.sh       |  51 ++
 .../fs/fs_bind/rbind/fs_bind_rbind27.sh       |  56 ++
 .../fs/fs_bind/rbind/fs_bind_rbind28.sh       |  51 ++
 .../fs/fs_bind/rbind/fs_bind_rbind29.sh       |  43 ++
 .../fs/fs_bind/rbind/fs_bind_rbind30.sh       |  38 ++
 .../fs/fs_bind/rbind/fs_bind_rbind31.sh       |  45 ++
 .../fs/fs_bind/rbind/fs_bind_rbind32.sh       |  38 ++
 .../fs/fs_bind/rbind/fs_bind_rbind33.sh       |  59 ++
 .../fs/fs_bind/rbind/fs_bind_rbind34.sh       |  43 ++
 .../fs/fs_bind/rbind/fs_bind_rbind35.sh       |  46 ++
 .../fs/fs_bind/rbind/fs_bind_rbind36.sh       |  41 ++
 .../fs/fs_bind/rbind/fs_bind_rbind37.sh       |  55 ++
 .../fs/fs_bind/rbind/fs_bind_rbind38.sh       |  54 ++
 .../fs/fs_bind/rbind/fs_bind_rbind39.sh       |  31 ++
 testcases/kernel/fs/fs_bind/rbind/test01      |  98 ----
 testcases/kernel/fs/fs_bind/rbind/test02      |  97 ----
 testcases/kernel/fs/fs_bind/rbind/test03      | 118 ----
 testcases/kernel/fs/fs_bind/rbind/test04      | 104 ----
 testcases/kernel/fs/fs_bind/rbind/test05      | 113 ----
 testcases/kernel/fs/fs_bind/rbind/test06      | 102 ----
 testcases/kernel/fs/fs_bind/rbind/test07      | 113 ----
 testcases/kernel/fs/fs_bind/rbind/test07-2    |  69 ---
 testcases/kernel/fs/fs_bind/rbind/test08      | 103 ----
 testcases/kernel/fs/fs_bind/rbind/test09      | 113 ----
 testcases/kernel/fs/fs_bind/rbind/test10      | 108 ----
 testcases/kernel/fs/fs_bind/rbind/test11      | 117 ----
 testcases/kernel/fs/fs_bind/rbind/test12      | 108 ----
 testcases/kernel/fs/fs_bind/rbind/test13      |  94 ----
 testcases/kernel/fs/fs_bind/rbind/test14      |  86 ---
 testcases/kernel/fs/fs_bind/rbind/test15      |  97 ----
 testcases/kernel/fs/fs_bind/rbind/test16      |  87 ---
 testcases/kernel/fs/fs_bind/rbind/test17      |  98 ----
 testcases/kernel/fs/fs_bind/rbind/test18      |  98 ----
 testcases/kernel/fs/fs_bind/rbind/test19      | 108 ----
 testcases/kernel/fs/fs_bind/rbind/test20      |  98 ----
 testcases/kernel/fs/fs_bind/rbind/test21      | 106 ----
 testcases/kernel/fs/fs_bind/rbind/test22      |  99 ----
 testcases/kernel/fs/fs_bind/rbind/test23      | 101 ----
 testcases/kernel/fs/fs_bind/rbind/test24      | 101 ----
 testcases/kernel/fs/fs_bind/rbind/test25      | 106 ----
 testcases/kernel/fs/fs_bind/rbind/test26      |  98 ----
 testcases/kernel/fs/fs_bind/rbind/test27      | 104 ----
 testcases/kernel/fs/fs_bind/rbind/test28      |  99 ----
 testcases/kernel/fs/fs_bind/rbind/test29      |  91 ---
 testcases/kernel/fs/fs_bind/rbind/test30      |  86 ---
 testcases/kernel/fs/fs_bind/rbind/test31      |  93 ----
 testcases/kernel/fs/fs_bind/rbind/test32      |  86 ---
 testcases/kernel/fs/fs_bind/rbind/test33      | 114 ----
 testcases/kernel/fs/fs_bind/rbind/test34      |  93 ----
 testcases/kernel/fs/fs_bind/rbind/test35      |  95 ----
 testcases/kernel/fs/fs_bind/rbind/test36      |  91 ---
 testcases/kernel/fs/fs_bind/rbind/test37      | 102 ----
 testcases/kernel/fs/fs_bind/rbind/test38      | 101 ----
 testcases/kernel/fs/fs_bind/rbind/test39      |  78 ---
 .../fs/fs_bind/regression/00_Descriptions.txt |  44 --
 testcases/kernel/fs/fs_bind/regression/test01 |  71 ---
 testcases/kernel/fs/fs_bind/regression/test02 |  78 ---
 testcases/kernel/fs/fs_bind/regression/test03 |  77 ---
 testscripts/test_fs_bind.sh                   | 526 ------------------
 232 files changed, 4859 insertions(+), 12007 deletions(-)
 delete mode 100644 testcases/kernel/fs/fs_bind/.gitignore
 delete mode 100644 testcases/kernel/fs/fs_bind/BUGS
 delete mode 100644 testcases/kernel/fs/fs_bind/CHANGELOG
 delete mode 100644 testcases/kernel/fs/fs_bind/README
 delete mode 100644 testcases/kernel/fs/fs_bind/TODO
 delete mode 100644 testcases/kernel/fs/fs_bind/bin/Makefile
 delete mode 100755 testcases/kernel/fs/fs_bind/bin/check_prop
 delete mode 100755 testcases/kernel/fs/fs_bind/bin/lockfile
 delete mode 100755 testcases/kernel/fs/fs_bind/bin/makedir
 delete mode 100644 testcases/kernel/fs/fs_bind/bin/nsclone.c
 delete mode 100755 testcases/kernel/fs/fs_bind/bin/setup
 delete mode 100755 testcases/kernel/fs/fs_bind/bin/setupnslock
 delete mode 100644 testcases/kernel/fs/fs_bind/bin/smount.c
 delete mode 100644 testcases/kernel/fs/fs_bind/bind/00_Descriptions.txt
 create mode 100644 testcases/kernel/fs/fs_bind/bind/Makefile
 create mode 100755 testcases/kernel/fs/fs_bind/bind/fs_bind01.sh
 create mode 100755 testcases/kernel/fs/fs_bind/bind/fs_bind02.sh
 create mode 100755 testcases/kernel/fs/fs_bind/bind/fs_bind03.sh
 create mode 100755 testcases/kernel/fs/fs_bind/bind/fs_bind04.sh
 create mode 100755 testcases/kernel/fs/fs_bind/bind/fs_bind05.sh
 create mode 100755 testcases/kernel/fs/fs_bind/bind/fs_bind06.sh
 create mode 100755 testcases/kernel/fs/fs_bind/bind/fs_bind07-2.sh
 create mode 100755 testcases/kernel/fs/fs_bind/bind/fs_bind07.sh
 create mode 100755 testcases/kernel/fs/fs_bind/bind/fs_bind08.sh
 create mode 100755 testcases/kernel/fs/fs_bind/bind/fs_bind09.sh
 create mode 100755 testcases/kernel/fs/fs_bind/bind/fs_bind10.sh
 create mode 100755 testcases/kernel/fs/fs_bind/bind/fs_bind11.sh
 create mode 100755 testcases/kernel/fs/fs_bind/bind/fs_bind12.sh
 create mode 100755 testcases/kernel/fs/fs_bind/bind/fs_bind13.sh
 create mode 100755 testcases/kernel/fs/fs_bind/bind/fs_bind14.sh
 create mode 100755 testcases/kernel/fs/fs_bind/bind/fs_bind15.sh
 create mode 100755 testcases/kernel/fs/fs_bind/bind/fs_bind16.sh
 create mode 100755 testcases/kernel/fs/fs_bind/bind/fs_bind17.sh
 create mode 100755 testcases/kernel/fs/fs_bind/bind/fs_bind18.sh
 create mode 100755 testcases/kernel/fs/fs_bind/bind/fs_bind19.sh
 create mode 100755 testcases/kernel/fs/fs_bind/bind/fs_bind20.sh
 create mode 100755 testcases/kernel/fs/fs_bind/bind/fs_bind21.sh
 create mode 100755 testcases/kernel/fs/fs_bind/bind/fs_bind22.sh
 create mode 100755 testcases/kernel/fs/fs_bind/bind/fs_bind23.sh
 create mode 100755 testcases/kernel/fs/fs_bind/bind/fs_bind24.sh
 delete mode 100755 testcases/kernel/fs/fs_bind/bind/test01
 delete mode 100755 testcases/kernel/fs/fs_bind/bind/test02
 delete mode 100755 testcases/kernel/fs/fs_bind/bind/test03
 delete mode 100755 testcases/kernel/fs/fs_bind/bind/test04
 delete mode 100755 testcases/kernel/fs/fs_bind/bind/test05
 delete mode 100755 testcases/kernel/fs/fs_bind/bind/test06
 delete mode 100755 testcases/kernel/fs/fs_bind/bind/test07
 delete mode 100755 testcases/kernel/fs/fs_bind/bind/test07-2
 delete mode 100755 testcases/kernel/fs/fs_bind/bind/test08
 delete mode 100755 testcases/kernel/fs/fs_bind/bind/test09
 delete mode 100755 testcases/kernel/fs/fs_bind/bind/test10
 delete mode 100755 testcases/kernel/fs/fs_bind/bind/test11
 delete mode 100755 testcases/kernel/fs/fs_bind/bind/test12
 delete mode 100755 testcases/kernel/fs/fs_bind/bind/test13
 delete mode 100755 testcases/kernel/fs/fs_bind/bind/test14
 delete mode 100755 testcases/kernel/fs/fs_bind/bind/test15
 delete mode 100755 testcases/kernel/fs/fs_bind/bind/test16
 delete mode 100755 testcases/kernel/fs/fs_bind/bind/test17
 delete mode 100755 testcases/kernel/fs/fs_bind/bind/test18
 delete mode 100755 testcases/kernel/fs/fs_bind/bind/test19
 delete mode 100755 testcases/kernel/fs/fs_bind/bind/test20
 delete mode 100755 testcases/kernel/fs/fs_bind/bind/test21
 delete mode 100755 testcases/kernel/fs/fs_bind/bind/test22
 delete mode 100755 testcases/kernel/fs/fs_bind/bind/test23
 delete mode 100755 testcases/kernel/fs/fs_bind/bind/test24
 delete mode 100644 testcases/kernel/fs/fs_bind/cloneNS/00_Descriptions.txt
 create mode 100644 testcases/kernel/fs/fs_bind/cloneNS/Makefile
 delete mode 100755 testcases/kernel/fs/fs_bind/cloneNS/child01
 delete mode 100755 testcases/kernel/fs/fs_bind/cloneNS/child02
 delete mode 100755 testcases/kernel/fs/fs_bind/cloneNS/child03
 delete mode 100755 testcases/kernel/fs/fs_bind/cloneNS/child04
 delete mode 100755 testcases/kernel/fs/fs_bind/cloneNS/child05
 delete mode 100755 testcases/kernel/fs/fs_bind/cloneNS/child06
 delete mode 100755 testcases/kernel/fs/fs_bind/cloneNS/child07
 create mode 100755 testcases/kernel/fs/fs_bind/cloneNS/fs_bind_cloneNS01.sh
 create mode 100755 testcases/kernel/fs/fs_bind/cloneNS/fs_bind_cloneNS02.sh
 create mode 100755 testcases/kernel/fs/fs_bind/cloneNS/fs_bind_cloneNS03.sh
 create mode 100755 testcases/kernel/fs/fs_bind/cloneNS/fs_bind_cloneNS04.sh
 create mode 100755 testcases/kernel/fs/fs_bind/cloneNS/fs_bind_cloneNS05.sh
 create mode 100755 testcases/kernel/fs/fs_bind/cloneNS/fs_bind_cloneNS06.sh
 create mode 100755 testcases/kernel/fs/fs_bind/cloneNS/fs_bind_cloneNS07.sh
 delete mode 100755 testcases/kernel/fs/fs_bind/cloneNS/parent01
 delete mode 100755 testcases/kernel/fs/fs_bind/cloneNS/parent02
 delete mode 100755 testcases/kernel/fs/fs_bind/cloneNS/parent03
 delete mode 100755 testcases/kernel/fs/fs_bind/cloneNS/parent04
 delete mode 100755 testcases/kernel/fs/fs_bind/cloneNS/parent05
 delete mode 100755 testcases/kernel/fs/fs_bind/cloneNS/parent06
 delete mode 100755 testcases/kernel/fs/fs_bind/cloneNS/parent07
 delete mode 100755 testcases/kernel/fs/fs_bind/cloneNS/test01
 delete mode 100755 testcases/kernel/fs/fs_bind/cloneNS/test02
 delete mode 100755 testcases/kernel/fs/fs_bind/cloneNS/test03
 delete mode 100755 testcases/kernel/fs/fs_bind/cloneNS/test04
 delete mode 100755 testcases/kernel/fs/fs_bind/cloneNS/test05
 delete mode 100755 testcases/kernel/fs/fs_bind/cloneNS/test06
 delete mode 100755 testcases/kernel/fs/fs_bind/cloneNS/test07
 create mode 100644 testcases/kernel/fs/fs_bind/fs_bind_lib.sh
 create mode 100755 testcases/kernel/fs/fs_bind/fs_bind_regression.sh
 delete mode 100644 testcases/kernel/fs/fs_bind/move/00_Descriptions.txt
 create mode 100644 testcases/kernel/fs/fs_bind/move/Makefile
 create mode 100755 testcases/kernel/fs/fs_bind/move/fs_bind_move01.sh
 create mode 100755 testcases/kernel/fs/fs_bind/move/fs_bind_move02.sh
 create mode 100755 testcases/kernel/fs/fs_bind/move/fs_bind_move03.sh
 create mode 100755 testcases/kernel/fs/fs_bind/move/fs_bind_move04.sh
 create mode 100755 testcases/kernel/fs/fs_bind/move/fs_bind_move05.sh
 create mode 100755 testcases/kernel/fs/fs_bind/move/fs_bind_move06.sh
 create mode 100755 testcases/kernel/fs/fs_bind/move/fs_bind_move07.sh
 create mode 100755 testcases/kernel/fs/fs_bind/move/fs_bind_move08.sh
 create mode 100755 testcases/kernel/fs/fs_bind/move/fs_bind_move09.sh
 create mode 100755 testcases/kernel/fs/fs_bind/move/fs_bind_move10.sh
 create mode 100755 testcases/kernel/fs/fs_bind/move/fs_bind_move11.sh
 create mode 100755 testcases/kernel/fs/fs_bind/move/fs_bind_move12.sh
 create mode 100755 testcases/kernel/fs/fs_bind/move/fs_bind_move13.sh
 create mode 100755 testcases/kernel/fs/fs_bind/move/fs_bind_move14.sh
 create mode 100755 testcases/kernel/fs/fs_bind/move/fs_bind_move15.sh
 create mode 100755 testcases/kernel/fs/fs_bind/move/fs_bind_move16.sh
 create mode 100755 testcases/kernel/fs/fs_bind/move/fs_bind_move17.sh
 create mode 100755 testcases/kernel/fs/fs_bind/move/fs_bind_move18.sh
 create mode 100755 testcases/kernel/fs/fs_bind/move/fs_bind_move19.sh
 create mode 100755 testcases/kernel/fs/fs_bind/move/fs_bind_move20.sh
 create mode 100755 testcases/kernel/fs/fs_bind/move/fs_bind_move21.sh
 create mode 100755 testcases/kernel/fs/fs_bind/move/fs_bind_move22.sh
 delete mode 100755 testcases/kernel/fs/fs_bind/move/test01
 delete mode 100755 testcases/kernel/fs/fs_bind/move/test02
 delete mode 100755 testcases/kernel/fs/fs_bind/move/test03
 delete mode 100755 testcases/kernel/fs/fs_bind/move/test04
 delete mode 100755 testcases/kernel/fs/fs_bind/move/test05
 delete mode 100755 testcases/kernel/fs/fs_bind/move/test06
 delete mode 100755 testcases/kernel/fs/fs_bind/move/test07
 delete mode 100755 testcases/kernel/fs/fs_bind/move/test08
 delete mode 100755 testcases/kernel/fs/fs_bind/move/test09
 delete mode 100755 testcases/kernel/fs/fs_bind/move/test10
 delete mode 100755 testcases/kernel/fs/fs_bind/move/test11
 delete mode 100755 testcases/kernel/fs/fs_bind/move/test12
 delete mode 100755 testcases/kernel/fs/fs_bind/move/test13
 delete mode 100755 testcases/kernel/fs/fs_bind/move/test14
 delete mode 100755 testcases/kernel/fs/fs_bind/move/test15
 delete mode 100755 testcases/kernel/fs/fs_bind/move/test16
 delete mode 100755 testcases/kernel/fs/fs_bind/move/test17
 delete mode 100755 testcases/kernel/fs/fs_bind/move/test18
 delete mode 100755 testcases/kernel/fs/fs_bind/move/test19
 delete mode 100755 testcases/kernel/fs/fs_bind/move/test20
 delete mode 100755 testcases/kernel/fs/fs_bind/move/test21
 delete mode 100755 testcases/kernel/fs/fs_bind/move/test22
 delete mode 100644 testcases/kernel/fs/fs_bind/rbind/00_Descriptions.txt
 create mode 100644 testcases/kernel/fs/fs_bind/rbind/Makefile
 create mode 100755 testcases/kernel/fs/fs_bind/rbind/fs_bind_rbind01.sh
 create mode 100755 testcases/kernel/fs/fs_bind/rbind/fs_bind_rbind02.sh
 create mode 100755 testcases/kernel/fs/fs_bind/rbind/fs_bind_rbind03.sh
 create mode 100755 testcases/kernel/fs/fs_bind/rbind/fs_bind_rbind04.sh
 create mode 100755 testcases/kernel/fs/fs_bind/rbind/fs_bind_rbind05.sh
 create mode 100755 testcases/kernel/fs/fs_bind/rbind/fs_bind_rbind06.sh
 create mode 100755 testcases/kernel/fs/fs_bind/rbind/fs_bind_rbind07-2.sh
 create mode 100755 testcases/kernel/fs/fs_bind/rbind/fs_bind_rbind07.sh
 create mode 100755 testcases/kernel/fs/fs_bind/rbind/fs_bind_rbind08.sh
 create mode 100755 testcases/kernel/fs/fs_bind/rbind/fs_bind_rbind09.sh
 create mode 100755 testcases/kernel/fs/fs_bind/rbind/fs_bind_rbind10.sh
 create mode 100755 testcases/kernel/fs/fs_bind/rbind/fs_bind_rbind11.sh
 create mode 100755 testcases/kernel/fs/fs_bind/rbind/fs_bind_rbind12.sh
 create mode 100755 testcases/kernel/fs/fs_bind/rbind/fs_bind_rbind13.sh
 create mode 100755 testcases/kernel/fs/fs_bind/rbind/fs_bind_rbind14.sh
 create mode 100755 testcases/kernel/fs/fs_bind/rbind/fs_bind_rbind15.sh
 create mode 100755 testcases/kernel/fs/fs_bind/rbind/fs_bind_rbind16.sh
 create mode 100755 testcases/kernel/fs/fs_bind/rbind/fs_bind_rbind17.sh
 create mode 100755 testcases/kernel/fs/fs_bind/rbind/fs_bind_rbind18.sh
 create mode 100755 testcases/kernel/fs/fs_bind/rbind/fs_bind_rbind19.sh
 create mode 100755 testcases/kernel/fs/fs_bind/rbind/fs_bind_rbind20.sh
 create mode 100755 testcases/kernel/fs/fs_bind/rbind/fs_bind_rbind21.sh
 create mode 100755 testcases/kernel/fs/fs_bind/rbind/fs_bind_rbind22.sh
 create mode 100755 testcases/kernel/fs/fs_bind/rbind/fs_bind_rbind23.sh
 create mode 100755 testcases/kernel/fs/fs_bind/rbind/fs_bind_rbind24.sh
 create mode 100755 testcases/kernel/fs/fs_bind/rbind/fs_bind_rbind25.sh
 create mode 100755 testcases/kernel/fs/fs_bind/rbind/fs_bind_rbind26.sh
 create mode 100755 testcases/kernel/fs/fs_bind/rbind/fs_bind_rbind27.sh
 create mode 100755 testcases/kernel/fs/fs_bind/rbind/fs_bind_rbind28.sh
 create mode 100755 testcases/kernel/fs/fs_bind/rbind/fs_bind_rbind29.sh
 create mode 100755 testcases/kernel/fs/fs_bind/rbind/fs_bind_rbind30.sh
 create mode 100755 testcases/kernel/fs/fs_bind/rbind/fs_bind_rbind31.sh
 create mode 100755 testcases/kernel/fs/fs_bind/rbind/fs_bind_rbind32.sh
 create mode 100755 testcases/kernel/fs/fs_bind/rbind/fs_bind_rbind33.sh
 create mode 100755 testcases/kernel/fs/fs_bind/rbind/fs_bind_rbind34.sh
 create mode 100755 testcases/kernel/fs/fs_bind/rbind/fs_bind_rbind35.sh
 create mode 100755 testcases/kernel/fs/fs_bind/rbind/fs_bind_rbind36.sh
 create mode 100755 testcases/kernel/fs/fs_bind/rbind/fs_bind_rbind37.sh
 create mode 100755 testcases/kernel/fs/fs_bind/rbind/fs_bind_rbind38.sh
 create mode 100755 testcases/kernel/fs/fs_bind/rbind/fs_bind_rbind39.sh
 delete mode 100755 testcases/kernel/fs/fs_bind/rbind/test01
 delete mode 100755 testcases/kernel/fs/fs_bind/rbind/test02
 delete mode 100755 testcases/kernel/fs/fs_bind/rbind/test03
 delete mode 100755 testcases/kernel/fs/fs_bind/rbind/test04
 delete mode 100755 testcases/kernel/fs/fs_bind/rbind/test05
 delete mode 100755 testcases/kernel/fs/fs_bind/rbind/test06
 delete mode 100755 testcases/kernel/fs/fs_bind/rbind/test07
 delete mode 100755 testcases/kernel/fs/fs_bind/rbind/test07-2
 delete mode 100755 testcases/kernel/fs/fs_bind/rbind/test08
 delete mode 100755 testcases/kernel/fs/fs_bind/rbind/test09
 delete mode 100755 testcases/kernel/fs/fs_bind/rbind/test10
 delete mode 100755 testcases/kernel/fs/fs_bind/rbind/test11
 delete mode 100755 testcases/kernel/fs/fs_bind/rbind/test12
 delete mode 100755 testcases/kernel/fs/fs_bind/rbind/test13
 delete mode 100755 testcases/kernel/fs/fs_bind/rbind/test14
 delete mode 100755 testcases/kernel/fs/fs_bind/rbind/test15
 delete mode 100755 testcases/kernel/fs/fs_bind/rbind/test16
 delete mode 100755 testcases/kernel/fs/fs_bind/rbind/test17
 delete mode 100755 testcases/kernel/fs/fs_bind/rbind/test18
 delete mode 100755 testcases/kernel/fs/fs_bind/rbind/test19
 delete mode 100755 testcases/kernel/fs/fs_bind/rbind/test20
 delete mode 100755 testcases/kernel/fs/fs_bind/rbind/test21
 delete mode 100755 testcases/kernel/fs/fs_bind/rbind/test22
 delete mode 100755 testcases/kernel/fs/fs_bind/rbind/test23
 delete mode 100755 testcases/kernel/fs/fs_bind/rbind/test24
 delete mode 100755 testcases/kernel/fs/fs_bind/rbind/test25
 delete mode 100755 testcases/kernel/fs/fs_bind/rbind/test26
 delete mode 100755 testcases/kernel/fs/fs_bind/rbind/test27
 delete mode 100755 testcases/kernel/fs/fs_bind/rbind/test28
 delete mode 100755 testcases/kernel/fs/fs_bind/rbind/test29
 delete mode 100755 testcases/kernel/fs/fs_bind/rbind/test30
 delete mode 100755 testcases/kernel/fs/fs_bind/rbind/test31
 delete mode 100755 testcases/kernel/fs/fs_bind/rbind/test32
 delete mode 100755 testcases/kernel/fs/fs_bind/rbind/test33
 delete mode 100755 testcases/kernel/fs/fs_bind/rbind/test34
 delete mode 100755 testcases/kernel/fs/fs_bind/rbind/test35
 delete mode 100755 testcases/kernel/fs/fs_bind/rbind/test36
 delete mode 100755 testcases/kernel/fs/fs_bind/rbind/test37
 delete mode 100755 testcases/kernel/fs/fs_bind/rbind/test38
 delete mode 100755 testcases/kernel/fs/fs_bind/rbind/test39
 delete mode 100644 testcases/kernel/fs/fs_bind/regression/00_Descriptions.txt
 delete mode 100755 testcases/kernel/fs/fs_bind/regression/test01
 delete mode 100755 testcases/kernel/fs/fs_bind/regression/test02
 delete mode 100755 testcases/kernel/fs/fs_bind/regression/test03
 delete mode 100755 testscripts/test_fs_bind.sh
runtest/fs_bind +105 -1
index 549d700de..c3e005234 100644
@@ -1,2 +1,106 @@
 #DESCRIPTION:Bind mounts and shared subtrees
-BindMounts	$LTPROOT/testscripts/test_fs_bind.sh
+#BindMounts	$LTPROOT/testscripts/test_fs_bind.sh
+
+fs_bind01_sh   fs_bind01.sh
+fs_bind02_sh   fs_bind02.sh
+fs_bind03_sh   fs_bind03.sh
+fs_bind04_sh   fs_bind04.sh
+fs_bind05_sh   fs_bind05.sh
+fs_bind06_sh   fs_bind06.sh
+fs_bind07_sh   fs_bind07.sh
+fs_bind07-2_sh   fs_bind07-2.sh
+fs_bind08_sh   fs_bind08.sh
+fs_bind09_sh   fs_bind09.sh
+fs_bind10_sh   fs_bind10.sh
+fs_bind11_sh   fs_bind11.sh
+fs_bind12_sh   fs_bind12.sh
+fs_bind13_sh   fs_bind13.sh
+fs_bind14_sh   fs_bind14.sh
+fs_bind15_sh   fs_bind15.sh
+fs_bind16_sh   fs_bind16.sh
+fs_bind17_sh   fs_bind17.sh
+fs_bind18_sh   fs_bind18.sh
+fs_bind19_sh   fs_bind19.sh
+fs_bind20_sh   fs_bind20.sh
+fs_bind21_sh   fs_bind21.sh
+fs_bind22_sh   fs_bind22.sh
+fs_bind23_sh   fs_bind23.sh
+fs_bind24_sh   fs_bind24.sh
+
+
+fs_bind_move01_sh fs_bind_move01.sh
+fs_bind_move02_sh fs_bind_move02.sh
+fs_bind_move03_sh fs_bind_move03.sh
+fs_bind_move04_sh fs_bind_move04.sh
+fs_bind_move05_sh fs_bind_move05.sh
+fs_bind_move06_sh fs_bind_move06.sh
+fs_bind_move07_sh fs_bind_move07.sh
+fs_bind_move08_sh fs_bind_move08.sh
+fs_bind_move09_sh fs_bind_move09.sh
+fs_bind_move10_sh fs_bind_move10.sh
+fs_bind_move11_sh fs_bind_move11.sh
+fs_bind_move12_sh fs_bind_move12.sh
+fs_bind_move13_sh fs_bind_move13.sh
+fs_bind_move14_sh fs_bind_move14.sh
+fs_bind_move15_sh fs_bind_move15.sh
+fs_bind_move16_sh fs_bind_move16.sh
+fs_bind_move17_sh fs_bind_move17.sh
+fs_bind_move18_sh fs_bind_move18.sh
+fs_bind_move19_sh fs_bind_move19.sh
+fs_bind_move20_sh fs_bind_move20.sh
+fs_bind_move21_sh fs_bind_move21.sh
+fs_bind_move22_sh fs_bind_move22.sh
+
+
+fs_bind_rbind01_sh fs_bind_rbind01.sh
+fs_bind_rbind02_sh fs_bind_rbind02.sh
+fs_bind_rbind03_sh fs_bind_rbind03.sh
+fs_bind_rbind04_sh fs_bind_rbind04.sh
+fs_bind_rbind05_sh fs_bind_rbind05.sh
+fs_bind_rbind06_sh fs_bind_rbind06.sh
+fs_bind_rbind07-2_sh fs_bind_rbind07-2.sh
+fs_bind_rbind07_sh fs_bind_rbind07.sh
+fs_bind_rbind08_sh fs_bind_rbind08.sh
+fs_bind_rbind09_sh fs_bind_rbind09.sh
+fs_bind_rbind10_sh fs_bind_rbind10.sh
+fs_bind_rbind11_sh fs_bind_rbind11.sh
+fs_bind_rbind12_sh fs_bind_rbind12.sh
+fs_bind_rbind13_sh fs_bind_rbind13.sh
+fs_bind_rbind14_sh fs_bind_rbind14.sh
+fs_bind_rbind15_sh fs_bind_rbind15.sh
+fs_bind_rbind16_sh fs_bind_rbind16.sh
+fs_bind_rbind17_sh fs_bind_rbind17.sh
+fs_bind_rbind18_sh fs_bind_rbind18.sh
+fs_bind_rbind19_sh fs_bind_rbind19.sh
+fs_bind_rbind20_sh fs_bind_rbind20.sh
+fs_bind_rbind21_sh fs_bind_rbind21.sh
+fs_bind_rbind22_sh fs_bind_rbind22.sh
+fs_bind_rbind23_sh fs_bind_rbind23.sh
+fs_bind_rbind24_sh fs_bind_rbind24.sh
+fs_bind_rbind25_sh fs_bind_rbind25.sh
+fs_bind_rbind26_sh fs_bind_rbind26.sh
+fs_bind_rbind27_sh fs_bind_rbind27.sh
+fs_bind_rbind28_sh fs_bind_rbind28.sh
+fs_bind_rbind29_sh fs_bind_rbind29.sh
+fs_bind_rbind30_sh fs_bind_rbind30.sh
+fs_bind_rbind31_sh fs_bind_rbind31.sh
+fs_bind_rbind32_sh fs_bind_rbind32.sh
+fs_bind_rbind33_sh fs_bind_rbind33.sh
+fs_bind_rbind34_sh fs_bind_rbind34.sh
+fs_bind_rbind35_sh fs_bind_rbind35.sh
+fs_bind_rbind36_sh fs_bind_rbind36.sh
+fs_bind_rbind37_sh fs_bind_rbind37.sh
+fs_bind_rbind38_sh fs_bind_rbind38.sh
+fs_bind_rbind39_sh fs_bind_rbind39.sh
+
+
+fs_bind_regression_sh fs_bind_regression.sh
+
+
+fs_bind_cloneNS01_sh fs_bind_cloneNS01.sh
+fs_bind_cloneNS02_sh fs_bind_cloneNS02.sh
+fs_bind_cloneNS03_sh fs_bind_cloneNS03.sh
+fs_bind_cloneNS04_sh fs_bind_cloneNS04.sh
+fs_bind_cloneNS05_sh fs_bind_cloneNS05.sh
+fs_bind_cloneNS06_sh fs_bind_cloneNS06.sh
+fs_bind_cloneNS07_sh fs_bind_cloneNS07.sh
testcases/kernel/fs/fs_bind/.gitignore deleted +0 -2
deleted file mode 100644
index c4344da91..000000000
@@ -1,2 +0,0 @@
-/bin/nsclone
-/bin/smount
testcases/kernel/fs/fs_bind/BUGS deleted +0 -5
deleted file mode 100644
index 51c1e30d9..000000000
@@ -1,5 +0,0 @@
-Clone Namespace Tests:
-	Currently the cloneNS test do not accurately report a final success or
-	failure value. To check if a test has passed, view the test output and
-	look at each individual check_prop test, and see if there are any
-	failures.
testcases/kernel/fs/fs_bind/CHANGELOG deleted +0 -84

84 lines not on this page · raw message

testcases/kernel/fs/fs_bind/Makefile +3 -25
index 26d640831..770a5e6a2 100644
@@ -1,33 +1,11 @@
-#
-#    kernel/fs/fs_bind testcases Makefile.
-#
-#    Copyright (C) 2009, Cisco Systems Inc.
-#
-#    This program is free software; you can redistribute it and/or modify
-#    it under the terms of the GNU General Public License as published by
-#    the Free Software Foundation; either version 2 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 General Public License for more details.
-#
-#    You should have received a copy of the GNU General Public License along
-#    with this program; if not, write to the Free Software Foundation, Inc.,
-#    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-#
+# SPDX-License-Identifier: GPL-2.0-or-later
+# Copyright (C) 2009, Cisco Systems Inc.
 # Ngie Cooper, July 2009
-#
 
 top_srcdir			?= ../../../..
 
 include $(top_srcdir)/include/mk/env_pre.mk
 
-INSTALL_DIR			:= $(prefix)/testcases/bin/fs_bind
-
-INSTALL_TARGETS			:= */test*
-
-RECURSIVE_TARGETS		:= all install uninstall
+INSTALL_TARGETS			:= fs_bind_lib.sh fs_bind_regression.sh
 
 include $(top_srcdir)/include/mk/generic_trunk_target.mk
testcases/kernel/fs/fs_bind/README deleted +0 -165

165 lines not on this page · raw message

testcases/kernel/fs/fs_bind/TODO deleted +0 -11
deleted file mode 100644
index 1730148ef..000000000
@@ -1,11 +0,0 @@
-Consider replacing long invocations
-	(replace "$FS_BIND_ROOT/bin/makedir") with something shorter).
-
-Factor out common bits of setup, setupnslock, and lockfile
-
-Rename smount to something more meaningful? (bind_mount ?)
-
-Check for leaks of vfsmount structs by diffing vfs slab cache obj numbers
-	(after -before)
-
-The cloneNS testcases need to be checked and tested -- consider them expiremental. (at least as of March 2008)
testcases/kernel/fs/fs_bind/bin/Makefile deleted +0 -31
deleted file mode 100644
index 2c09a286d..000000000
@@ -1,31 +0,0 @@
-#
-#    testcases/kernel/fs/fs_bind/bin Makefile.
-#
-#    Copyright (C) 2009, Cisco Systems Inc.
-#
-#    This program is free software; you can redistribute it and/or modify
-#    it under the terms of the GNU General Public License as published by
-#    the Free Software Foundation; either version 2 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 General Public License for more details.
-#
-#    You should have received a copy of the GNU General Public License along
-#    with this program; if not, write to the Free Software Foundation, Inc.,
-#    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Ngie Cooper, September 2009
-#
-
-top_srcdir		?= ../../../../..
-
-include $(top_srcdir)/include/mk/testcases.mk
-
-INSTALL_DIR		:= $(prefix)/testcases/bin/fs_bind/bin
-
-INSTALL_TARGETS		:= check_prop lockfile makedir setup setupnslock
-
-include $(top_srcdir)/include/mk/generic_leaf_target.mk
testcases/kernel/fs/fs_bind/bin/check_prop deleted +0 -73

73 lines not on this page · raw message

testcases/kernel/fs/fs_bind/bin/lockfile deleted +0 -84

84 lines not on this page · raw message

testcases/kernel/fs/fs_bind/bin/makedir deleted +0 -101

101 lines not on this page · raw message

testcases/kernel/fs/fs_bind/bin/nsclone.c deleted +0 -68

68 lines not on this page · raw message

testcases/kernel/fs/fs_bind/bin/setup deleted +0 -104

104 lines not on this page · raw message

testcases/kernel/fs/fs_bind/bin/setupnslock deleted +0 -64

64 lines not on this page · raw message

testcases/kernel/fs/fs_bind/bin/smount.c deleted +0 -73

73 lines not on this page · raw message

testcases/kernel/fs/fs_bind/bind/00_Descriptions.txt deleted +0 -176

176 lines not on this page · raw message

testcases/kernel/fs/fs_bind/bind/Makefile new file +11 -0
new file mode 100644
index 000000000..48233262e
@@ -0,0 +1,11 @@
+# SPDX-License-Identifier: GPL-2.0-or-later
+# Copyright (C) 2009, Cisco Systems Inc.
+# Ngie Cooper, July 2009
+
+top_srcdir			?= ../../../../..
+
+include $(top_srcdir)/include/mk/env_pre.mk
+
+INSTALL_TARGETS			:= fs_bind*
+
+include $(top_srcdir)/include/mk/generic_leaf_target.mk
testcases/kernel/fs/fs_bind/bind/fs_bind01.sh new file +48 -0

48 lines not on this page · raw message

testcases/kernel/fs/fs_bind/bind/fs_bind02.sh new file +50 -0

50 lines not on this page · raw message

testcases/kernel/fs/fs_bind/bind/fs_bind03.sh new file +61 -0

61 lines not on this page · raw message

testcases/kernel/fs/fs_bind/bind/fs_bind04.sh new file +50 -0

50 lines not on this page · raw message

testcases/kernel/fs/fs_bind/bind/fs_bind05.sh new file +58 -0

58 lines not on this page · raw message

testcases/kernel/fs/fs_bind/bind/fs_bind06.sh new file +47 -0

47 lines not on this page · raw message

testcases/kernel/fs/fs_bind/bind/fs_bind07-2.sh new file +34 -0
new file mode 100755
index 000000000..92e71c976
@@ -0,0 +1,34 @@
+#!/bin/sh
+# SPDX-License-Identifier: GPL-2.0-or-later
+# Copyright (c) International Business Machines  Corp., 2005
+# Copyright (c) 2021 Joerg Vehlow <[email protected]>
+# Author: Avantika Mathur ([email protected])
+
+FS_BIND_TESTFUNC=test
+
+. fs_bind_lib.sh
+
+test()
+{
+	tst_res TINFO "bind: create slave then mount master - slave still propagates"
+
+	fs_bind_makedir rshared parent2
+	fs_bind_makedir rshared share2
+
+	EXPECT_PASS mount --bind share2 parent2
+	EXPECT_PASS mount --make-slave parent2
+	EXPECT_PASS mount --bind "$FS_BIND_DISK1" share2
+	fs_bind_check parent2 share2
+
+	EXPECT_PASS mount --bind "$FS_BIND_DISK2" parent2/a
+	fs_bind_check -n parent2/a share2/a
+
+	EXPECT_PASS umount parent2/a
+	EXPECT_PASS umount parent2
+	EXPECT_PASS umount parent2
+	EXPECT_PASS umount parent2
+	EXPECT_PASS umount share2
+	EXPECT_PASS umount share2
+}
+
+tst_run
testcases/kernel/fs/fs_bind/bind/fs_bind07.sh new file +57 -0

57 lines not on this page · raw message

testcases/kernel/fs/fs_bind/bind/fs_bind08.sh new file +48 -0

48 lines not on this page · raw message

testcases/kernel/fs/fs_bind/bind/fs_bind09.sh new file +57 -0

57 lines not on this page · raw message

testcases/kernel/fs/fs_bind/bind/fs_bind10.sh new file +52 -0

52 lines not on this page · raw message

testcases/kernel/fs/fs_bind/bind/fs_bind11.sh new file +63 -0

63 lines not on this page · raw message

testcases/kernel/fs/fs_bind/bind/fs_bind12.sh new file +52 -0

52 lines not on this page · raw message

testcases/kernel/fs/fs_bind/bind/fs_bind13.sh new file +38 -0
new file mode 100755
index 000000000..7090a2b6f
@@ -0,0 +1,38 @@
+#!/bin/sh
+# SPDX-License-Identifier: GPL-2.0-or-later
+# Copyright (c) International Business Machines  Corp., 2005
+# Copyright (c) 2021 Joerg Vehlow <[email protected]>
+# Author: Avantika Mathur ([email protected])
+
+FS_BIND_TESTFUNC=test
+
+. fs_bind_lib.sh
+
+test()
+{
+	tst_res TINFO "bind: uncloneable child to shared parent"
+
+	fs_bind_makedir rshared parent1
+	fs_bind_makedir rshared parent2
+	fs_bind_makedir rshared share1
+	fs_bind_makedir rshared share2
+	fs_bind_makedir runbindable parent1/child1
+
+	EXPECT_PASS mount --bind parent1 share1
+	EXPECT_PASS mount --bind parent2 share2
+	mkdir parent1/child1/x
+	EXPECT_PASS mount --bind "$FS_BIND_DISK1" parent1/child1/x
+	mkdir parent2/child2
+	EXPECT_FAIL mount --bind parent1/child1 parent2/child2
+
+	EXPECT_PASS umount parent1/child1/x
+	EXPECT_PASS umount parent1/child1
+	EXPECT_PASS umount share1
+	EXPECT_PASS umount share1
+	EXPECT_PASS umount share2
+	EXPECT_PASS umount share2
+	EXPECT_PASS umount parent2
+	EXPECT_PASS umount parent1
+}
+
+tst_run
testcases/kernel/fs/fs_bind/bind/fs_bind14.sh new file +34 -0
new file mode 100755
index 000000000..dd0c1345b
@@ -0,0 +1,34 @@
+#!/bin/sh
+# SPDX-License-Identifier: GPL-2.0-or-later
+# Copyright (c) International Business Machines  Corp., 2005
+# Copyright (c) 2021 Joerg Vehlow <[email protected]>
+# Author: Avantika Mathur ([email protected])
+
+FS_BIND_TESTFUNC=test
+
+. fs_bind_lib.sh
+
+test()
+{
+	tst_res TINFO "bind: uncloneable child to private parent"
+
+	fs_bind_makedir rshared parent1
+	fs_bind_makedir private parent2
+	fs_bind_makedir rshared share1
+	fs_bind_makedir runbindable parent1/child1
+	mkdir parent1/child1/x
+
+	EXPECT_PASS mount --bind parent1 share1
+	EXPECT_PASS mount --bind "$FS_BIND_DISK1" parent1/child1/x
+	mkdir parent2/child2
+	EXPECT_FAIL mount --bind parent1/child1 parent2/child2
+
+	EXPECT_PASS umount parent1/child1/x
+	EXPECT_PASS umount parent1/child1
+	EXPECT_PASS umount share1
+	EXPECT_PASS umount share1
+	EXPECT_PASS umount parent2
+	EXPECT_PASS umount parent1
+}
+
+tst_run
testcases/kernel/fs/fs_bind/bind/fs_bind15.sh new file +43 -0

43 lines not on this page · raw message

testcases/kernel/fs/fs_bind/bind/fs_bind16.sh new file +35 -0
new file mode 100755
index 000000000..85bbd9f90
@@ -0,0 +1,35 @@
+#!/bin/sh
+# SPDX-License-Identifier: GPL-2.0-or-later
+# Copyright (c) International Business Machines  Corp., 2005
+# Copyright (c) 2021 Joerg Vehlow <[email protected]>
+# Author: Avantika Mathur ([email protected])
+
+FS_BIND_TESTFUNC=test
+
+. fs_bind_lib.sh
+
+test()
+{
+	tst_res TINFO "bind: uncloneable child to uncloneable parent"
+
+	fs_bind_makedir rshared parent1
+	fs_bind_makedir runbindable parent2
+	fs_bind_makedir rshared share1
+	fs_bind_makedir runbindable parent1/child1
+	mkdir parent1/child1/x
+
+	EXPECT_PASS mount --bind parent1 share1
+	EXPECT_PASS mount --bind "$FS_BIND_DISK1" parent1/child1/x
+
+	mkdir parent2/child2
+	EXPECT_FAIL mount --bind parent1/child1 parent2/child2
+
+	EXPECT_PASS umount parent1/child1/x
+	EXPECT_PASS umount parent1/child1
+	EXPECT_PASS umount share1
+	EXPECT_PASS umount share1
+	EXPECT_PASS umount parent2
+	EXPECT_PASS umount parent1
+}
+
+tst_run
testcases/kernel/fs/fs_bind/bind/fs_bind17.sh new file +48 -0

48 lines not on this page · raw message

testcases/kernel/fs/fs_bind/bind/fs_bind18.sh new file +48 -0

48 lines not on this page · raw message

testcases/kernel/fs/fs_bind/bind/fs_bind19.sh new file +52 -0

52 lines not on this page · raw message

testcases/kernel/fs/fs_bind/bind/fs_bind20.sh new file +48 -0

48 lines not on this page · raw message

testcases/kernel/fs/fs_bind/bind/fs_bind21.sh new file +57 -0

57 lines not on this page · raw message

testcases/kernel/fs/fs_bind/bind/fs_bind22.sh new file +40 -0
new file mode 100755
index 000000000..d013f8c7d
@@ -0,0 +1,40 @@
+#!/bin/sh
+# SPDX-License-Identifier: GPL-2.0-or-later
+# Copyright (c) International Business Machines  Corp., 2005
+# Copyright (c) 2021 Joerg Vehlow <[email protected]>
+# Author: Avantika Mathur ([email protected])
+
+FS_BIND_TESTFUNC=test
+
+. fs_bind_lib.sh
+
+test()
+{
+	tst_res TINFO "bind: bind within same tree - root to child"
+
+	fs_bind_makedir rshared parent
+	fs_bind_makedir rshared parent/child1
+	fs_bind_makedir rshared parent/child2
+
+	EXPECT_PASS mount --bind parent parent/child2/
+	fs_bind_check parent parent/child2/
+
+	EXPECT_PASS mount --bind "$FS_BIND_DISK3" parent/child2/child1
+	fs_bind_check parent/child1 parent/child2/child1
+
+	EXPECT_PASS umount parent/child2/child1
+	fs_bind_check parent/child1 parent/child2/child1
+
+	EXPECT_PASS mount --bind "$FS_BIND_DISK4" parent/child2/child1
+	fs_bind_check parent/child1 parent/child2/child1
+
+	EXPECT_PASS umount parent/child1
+	fs_bind_check parent/child1 parent/child2/child1
+
+	EXPECT_PASS umount parent/child1
+	EXPECT_PASS umount parent/child2
+	EXPECT_PASS umount parent/child2
+	EXPECT_PASS umount parent
+}
+
+tst_run
testcases/kernel/fs/fs_bind/bind/fs_bind23.sh new file +40 -0
new file mode 100755
index 000000000..af7aaa095
@@ -0,0 +1,40 @@
+#!/bin/sh
+# SPDX-License-Identifier: GPL-2.0-or-later
+# Copyright (c) International Business Machines  Corp., 2005
+# Copyright (c) 2021 Joerg Vehlow <[email protected]>
+# Author: Avantika Mathur ([email protected])
+
+FS_BIND_TESTFUNC=test
+
+. fs_bind_lib.sh
+
+test()
+{
+	tst_res TINFO "bind: shared child to shared parent"
+
+	fs_bind_makedir private mnt
+	fs_bind_makedir rshared mnt/1
+
+	mkdir mnt/2 mnt/1/abc
+	EXPECT_PASS mount --bind mnt/1 mnt/2
+	EXPECT_PASS mount --bind "$FS_BIND_DISK1" mnt/1/abc
+
+	fs_bind_check mnt/1/abc mnt/2/abc "$FS_BIND_DISK1"
+
+	mkdir tmp2
+	fs_bind_makedir rshared tmp1
+	EXPECT_PASS mount --bind tmp1 tmp2
+
+	mkdir tmp1/3
+	EXPECT_PASS mount --move mnt tmp1/3
+	fs_bind_check tmp1/3/1/abc tmp2/3/1/abc tmp2/3/2/abc "$FS_BIND_DISK1"
+
+	EXPECT_PASS umount tmp1/3/1/abc
+	EXPECT_PASS umount tmp1/3/1
+	EXPECT_PASS umount tmp1/3/2
+	EXPECT_PASS umount tmp1/3
+	EXPECT_PASS umount tmp1
+	EXPECT_PASS umount tmp2
+}
+
+tst_run
testcases/kernel/fs/fs_bind/bind/fs_bind24.sh new file +35 -0
new file mode 100755
index 000000000..fe9a816e7
@@ -0,0 +1,35 @@
+#!/bin/sh
+# SPDX-License-Identifier: GPL-2.0-or-later
+# Copyright (c) International Business Machines  Corp., 2005
+# Copyright (c) 2021 Joerg Vehlow <[email protected]>
+# Author: Avantika Mathur ([email protected])
+
+FS_BIND_TESTFUNC=test
+
+. fs_bind_lib.sh
+
+test()
+{
+	tst_res TINFO "bind: shared child to shared parent"
+
+	fs_bind_makedir rshared dir1
+	mkdir dir1/1 dir1/1/2 dir1/1/2/3 dir1/1/2/fs_bind_check dir2 dir3 dir4
+	touch dir4/ls
+
+	EXPECT_PASS mount --bind dir1/1/2 dir2
+	EXPECT_PASS mount --make-rslave dir1
+	EXPECT_PASS mount --make-rshared dir1
+
+	EXPECT_PASS mount --bind dir1/1/2/3 dir3
+	EXPECT_PASS mount --make-rslave dir1
+
+	EXPECT_PASS mount --bind dir4 dir2/fs_bind_check
+	fs_bind_check dir1/1/2/fs_bind_check/ dir4
+
+	EXPECT_PASS umount dir2/fs_bind_check
+	EXPECT_PASS umount dir3
+	EXPECT_PASS umount dir2
+	EXPECT_PASS umount dir1
+}
+
+tst_run
testcases/kernel/fs/fs_bind/bind/test01 deleted +0 -99

99 lines not on this page · raw message

testcases/kernel/fs/fs_bind/bind/test02 deleted +0 -102

102 lines not on this page · raw message

testcases/kernel/fs/fs_bind/bind/test03 deleted +0 -118

118 lines not on this page · raw message

testcases/kernel/fs/fs_bind/bind/test04 deleted +0 -104

104 lines not on this page · raw message

testcases/kernel/fs/fs_bind/bind/test05 deleted +0 -113

113 lines not on this page · raw message

testcases/kernel/fs/fs_bind/bind/test06 deleted +0 -102

74 lines not on this page · raw message

testcases/kernel/fs/fs_bind/bind/test07 deleted +0 -113

113 lines not on this page · raw message

testcases/kernel/fs/fs_bind/bind/test07-2 deleted +0 -69

69 lines not on this page · raw message

testcases/kernel/fs/fs_bind/bind/test08 deleted +0 -102

102 lines not on this page · raw message

testcases/kernel/fs/fs_bind/bind/test09 deleted +0 -113

113 lines not on this page · raw message

testcases/kernel/fs/fs_bind/bind/test10 deleted +0 -108

108 lines not on this page · raw message

testcases/kernel/fs/fs_bind/bind/test11 deleted +0 -116

116 lines not on this page · raw message

testcases/kernel/fs/fs_bind/bind/test12 deleted +0 -108

108 lines not on this page · raw message

testcases/kernel/fs/fs_bind/bind/test13 deleted +0 -90

90 lines not on this page · raw message

testcases/kernel/fs/fs_bind/bind/test14 deleted +0 -86

86 lines not on this page · raw message

testcases/kernel/fs/fs_bind/bind/test15 deleted +0 -96

96 lines not on this page · raw message

testcases/kernel/fs/fs_bind/bind/test16 deleted +0 -87

87 lines not on this page · raw message

testcases/kernel/fs/fs_bind/bind/test17 deleted +0 -100

100 lines not on this page · raw message

testcases/kernel/fs/fs_bind/bind/test18 deleted +0 -98

98 lines not on this page · raw message

testcases/kernel/fs/fs_bind/bind/test19 deleted +0 -109

109 lines not on this page · raw message

testcases/kernel/fs/fs_bind/bind/test20 deleted +0 -98

98 lines not on this page · raw message

testcases/kernel/fs/fs_bind/bind/test21 deleted +0 -114

114 lines not on this page · raw message

testcases/kernel/fs/fs_bind/bind/test22 deleted +0 -95

95 lines not on this page · raw message

testcases/kernel/fs/fs_bind/bind/test23 deleted +0 -89

89 lines not on this page · raw message

testcases/kernel/fs/fs_bind/bind/test24 deleted +0 -87

87 lines not on this page · raw message

testcases/kernel/fs/fs_bind/cloneNS/00_Descriptions.txt deleted +0 -70

70 lines not on this page · raw message

testcases/kernel/fs/fs_bind/cloneNS/Makefile new file +11 -0
new file mode 100644
index 000000000..48233262e

Lines of this file are not shown. View the raw message.

testcases/kernel/fs/fs_bind/cloneNS/child01 deleted +0 -34
deleted file mode 100755
index 4e667941f..000000000

Lines of this file are not shown. View the raw message.

testcases/kernel/fs/fs_bind/cloneNS/child02 deleted +0 -42

42 lines not on this page · raw message

testcases/kernel/fs/fs_bind/cloneNS/child03 deleted +0 -32
deleted file mode 100755
index 2b78bc3bc..000000000

Lines of this file are not shown. View the raw message.

testcases/kernel/fs/fs_bind/cloneNS/child04 deleted +0 -33
deleted file mode 100755
index b6ba67c62..000000000

Lines of this file are not shown. View the raw message.

testcases/kernel/fs/fs_bind/cloneNS/child05 deleted +0 -41

41 lines not on this page · raw message

testcases/kernel/fs/fs_bind/cloneNS/child06 deleted +0 -49

49 lines not on this page · raw message

testcases/kernel/fs/fs_bind/cloneNS/child07 deleted +0 -42

42 lines not on this page · raw message

testcases/kernel/fs/fs_bind/cloneNS/fs_bind_cloneNS01.sh new file +38 -0
new file mode 100755
index 000000000..e4d0bb42d

Lines of this file are not shown. View the raw message.

testcases/kernel/fs/fs_bind/cloneNS/fs_bind_cloneNS02.sh new file +53 -0

53 lines not on this page · raw message

testcases/kernel/fs/fs_bind/cloneNS/fs_bind_cloneNS03.sh new file +27 -0
new file mode 100755
index 000000000..a7bb819b1

Lines of this file are not shown. View the raw message.

testcases/kernel/fs/fs_bind/cloneNS/fs_bind_cloneNS04.sh new file +31 -0
new file mode 100755
index 000000000..4236a1fb9

Lines of this file are not shown. View the raw message.

testcases/kernel/fs/fs_bind/cloneNS/fs_bind_cloneNS05.sh new file +55 -0

55 lines not on this page · raw message

testcases/kernel/fs/fs_bind/cloneNS/fs_bind_cloneNS06.sh new file +77 -0

77 lines not on this page · raw message

testcases/kernel/fs/fs_bind/cloneNS/fs_bind_cloneNS07.sh new file +55 -0

55 lines not on this page · raw message

testcases/kernel/fs/fs_bind/cloneNS/parent01 deleted +0 -44

44 lines not on this page · raw message

testcases/kernel/fs/fs_bind/cloneNS/parent02 deleted +0 -45

45 lines not on this page · raw message

testcases/kernel/fs/fs_bind/cloneNS/parent03 deleted +0 -34
deleted file mode 100755
index e9c3b77c5..000000000

Lines of this file are not shown. View the raw message.

testcases/kernel/fs/fs_bind/cloneNS/parent04 deleted +0 -37
deleted file mode 100755
index 58ac7306d..000000000

Lines of this file are not shown. View the raw message.

testcases/kernel/fs/fs_bind/cloneNS/parent05 deleted +0 -45

45 lines not on this page · raw message

testcases/kernel/fs/fs_bind/cloneNS/parent06 deleted +0 -51

51 lines not on this page · raw message

testcases/kernel/fs/fs_bind/cloneNS/parent07 deleted +0 -48

48 lines not on this page · raw message

testcases/kernel/fs/fs_bind/cloneNS/test01 deleted +0 -85

85 lines not on this page · raw message

testcases/kernel/fs/fs_bind/cloneNS/test02 deleted +0 -85

85 lines not on this page · raw message

testcases/kernel/fs/fs_bind/cloneNS/test03 deleted +0 -77

77 lines not on this page · raw message

testcases/kernel/fs/fs_bind/cloneNS/test04 deleted +0 -78

78 lines not on this page · raw message

testcases/kernel/fs/fs_bind/cloneNS/test05 deleted +0 -90

90 lines not on this page · raw message

testcases/kernel/fs/fs_bind/cloneNS/test06 deleted +0 -96

96 lines not on this page · raw message

testcases/kernel/fs/fs_bind/cloneNS/test07 deleted +0 -91

91 lines not on this page · raw message

testcases/kernel/fs/fs_bind/fs_bind_lib.sh new file +246 -0

246 lines not on this page · raw message

testcases/kernel/fs/fs_bind/fs_bind_regression.sh new file +56 -0

56 lines not on this page · raw message

testcases/kernel/fs/fs_bind/move/00_Descriptions.txt deleted +0 -158

158 lines not on this page · raw message

testcases/kernel/fs/fs_bind/move/Makefile new file +11 -0
new file mode 100644
index 000000000..48233262e

Lines of this file are not shown. View the raw message.

testcases/kernel/fs/fs_bind/move/fs_bind_move01.sh new file +44 -0

44 lines not on this page · raw message

testcases/kernel/fs/fs_bind/move/fs_bind_move02.sh new file +45 -0

45 lines not on this page · raw message

testcases/kernel/fs/fs_bind/move/fs_bind_move03.sh new file +47 -0

47 lines not on this page · raw message

testcases/kernel/fs/fs_bind/move/fs_bind_move04.sh new file +41 -0

41 lines not on this page · raw message

testcases/kernel/fs/fs_bind/move/fs_bind_move05.sh new file +44 -0

44 lines not on this page · raw message

testcases/kernel/fs/fs_bind/move/fs_bind_move06.sh new file +40 -0
new file mode 100755
index 000000000..e0d027fc5

Lines of this file are not shown. View the raw message.

testcases/kernel/fs/fs_bind/move/fs_bind_move07.sh new file +41 -0

41 lines not on this page · raw message

testcases/kernel/fs/fs_bind/move/fs_bind_move08.sh new file +35 -0
new file mode 100755
index 000000000..a3d7082c5

Lines of this file are not shown. View the raw message.

testcases/kernel/fs/fs_bind/move/fs_bind_move09.sh new file +50 -0

50 lines not on this page · raw message

testcases/kernel/fs/fs_bind/move/fs_bind_move10.sh new file +46 -0

46 lines not on this page · raw message

testcases/kernel/fs/fs_bind/move/fs_bind_move11.sh new file +47 -0

47 lines not on this page · raw message

testcases/kernel/fs/fs_bind/move/fs_bind_move12.sh new file +45 -0

45 lines not on this page · raw message

testcases/kernel/fs/fs_bind/move/fs_bind_move13.sh new file +30 -0
new file mode 100755
index 000000000..d46058a47

Lines of this file are not shown. View the raw message.

testcases/kernel/fs/fs_bind/move/fs_bind_move14.sh new file +32 -0
new file mode 100755
index 000000000..78cb455cf

Lines of this file are not shown. View the raw message.

testcases/kernel/fs/fs_bind/move/fs_bind_move15.sh new file +32 -0
new file mode 100755
index 000000000..e74fb713f

Lines of this file are not shown. View the raw message.

testcases/kernel/fs/fs_bind/move/fs_bind_move16.sh new file +29 -0
new file mode 100755
index 000000000..7ab16afaa

Lines of this file are not shown. View the raw message.

testcases/kernel/fs/fs_bind/move/fs_bind_move17.sh new file +27 -0
new file mode 100755
index 000000000..dbd2fa80a

Lines of this file are not shown. View the raw message.

testcases/kernel/fs/fs_bind/move/fs_bind_move18.sh new file +47 -0

47 lines not on this page · raw message

testcases/kernel/fs/fs_bind/move/fs_bind_move19.sh new file +47 -0

47 lines not on this page · raw message

testcases/kernel/fs/fs_bind/move/fs_bind_move20.sh new file +31 -0
new file mode 100755
index 000000000..a9012a5f1

Lines of this file are not shown. View the raw message.

testcases/kernel/fs/fs_bind/move/fs_bind_move21.sh new file +44 -0

44 lines not on this page · raw message

testcases/kernel/fs/fs_bind/move/fs_bind_move22.sh new file +37 -0
new file mode 100755
index 000000000..61dbc712b

Lines of this file are not shown. View the raw message.

testcases/kernel/fs/fs_bind/move/test01 deleted +0 -93

93 lines not on this page · raw message

testcases/kernel/fs/fs_bind/move/test02 deleted +0 -94

94 lines not on this page · raw message

testcases/kernel/fs/fs_bind/move/test03 deleted +0 -97

97 lines not on this page · raw message

testcases/kernel/fs/fs_bind/move/test04 deleted +0 -89

89 lines not on this page · raw message

testcases/kernel/fs/fs_bind/move/test05 deleted +0 -94

94 lines not on this page · raw message

testcases/kernel/fs/fs_bind/move/test06 deleted +0 -88

88 lines not on this page · raw message

testcases/kernel/fs/fs_bind/move/test07 deleted +0 -91

91 lines not on this page · raw message

testcases/kernel/fs/fs_bind/move/test08 deleted +0 -85

85 lines not on this page · raw message

testcases/kernel/fs/fs_bind/move/test09 deleted +0 -99

99 lines not on this page · raw message

testcases/kernel/fs/fs_bind/move/test10 deleted +0 -100

100 lines not on this page · raw message

testcases/kernel/fs/fs_bind/move/test11 deleted +0 -98

98 lines not on this page · raw message

testcases/kernel/fs/fs_bind/move/test12 deleted +0 -98

98 lines not on this page · raw message

testcases/kernel/fs/fs_bind/move/test13 deleted +0 -80

80 lines not on this page · raw message

testcases/kernel/fs/fs_bind/move/test14 deleted +0 -82

82 lines not on this page · raw message

testcases/kernel/fs/fs_bind/move/test15 deleted +0 -82

82 lines not on this page · raw message

testcases/kernel/fs/fs_bind/move/test16 deleted +0 -80

80 lines not on this page · raw message

testcases/kernel/fs/fs_bind/move/test17 deleted +0 -77

77 lines not on this page · raw message

testcases/kernel/fs/fs_bind/move/test18 deleted +0 -101

101 lines not on this page · raw message

testcases/kernel/fs/fs_bind/move/test19 deleted +0 -95

95 lines not on this page · raw message

testcases/kernel/fs/fs_bind/move/test20 deleted +0 -79

79 lines not on this page · raw message

testcases/kernel/fs/fs_bind/move/test21 deleted +0 -93

93 lines not on this page · raw message

testcases/kernel/fs/fs_bind/move/test22 deleted +0 -87

87 lines not on this page · raw message

testcases/kernel/fs/fs_bind/rbind/00_Descriptions.txt deleted +0 -266

266 lines not on this page · raw message

testcases/kernel/fs/fs_bind/rbind/Makefile new file +11 -0
new file mode 100644
index 000000000..48233262e

Lines of this file are not shown. View the raw message.

testcases/kernel/fs/fs_bind/rbind/fs_bind_rbind01.sh new file +50 -0

50 lines not on this page · raw message

testcases/kernel/fs/fs_bind/rbind/fs_bind_rbind02.sh new file +50 -0

50 lines not on this page · raw message

testcases/kernel/fs/fs_bind/rbind/fs_bind_rbind03.sh new file +61 -0

61 lines not on this page · raw message

testcases/kernel/fs/fs_bind/rbind/fs_bind_rbind04.sh new file +52 -0

52 lines not on this page · raw message

testcases/kernel/fs/fs_bind/rbind/fs_bind_rbind05.sh new file +62 -0

62 lines not on this page · raw message

testcases/kernel/fs/fs_bind/rbind/fs_bind_rbind06.sh new file +52 -0

52 lines not on this page · raw message

testcases/kernel/fs/fs_bind/rbind/fs_bind_rbind07-2.sh new file +37 -0
new file mode 100755
index 000000000..11db71998

Lines of this file are not shown. View the raw message.

testcases/kernel/fs/fs_bind/rbind/fs_bind_rbind07.sh new file +62 -0

62 lines not on this page · raw message

testcases/kernel/fs/fs_bind/rbind/fs_bind_rbind08.sh new file +52 -0

52 lines not on this page · raw message

testcases/kernel/fs/fs_bind/rbind/fs_bind_rbind09.sh new file +63 -0

63 lines not on this page · raw message

testcases/kernel/fs/fs_bind/rbind/fs_bind_rbind10.sh new file +58 -0

58 lines not on this page · raw message

testcases/kernel/fs/fs_bind/rbind/fs_bind_rbind11.sh new file +68 -0

68 lines not on this page · raw message

testcases/kernel/fs/fs_bind/rbind/fs_bind_rbind12.sh new file +58 -0

58 lines not on this page · raw message

testcases/kernel/fs/fs_bind/rbind/fs_bind_rbind13.sh new file +39 -0
new file mode 100755
index 000000000..5a6775e4f

Lines of this file are not shown. View the raw message.

testcases/kernel/fs/fs_bind/rbind/fs_bind_rbind14.sh new file +35 -0
new file mode 100755
index 000000000..164ded501

Lines of this file are not shown. View the raw message.

testcases/kernel/fs/fs_bind/rbind/fs_bind_rbind15.sh new file +45 -0

45 lines not on this page · raw message

testcases/kernel/fs/fs_bind/rbind/fs_bind_rbind16.sh new file +36 -0
new file mode 100755
index 000000000..8cb193e21

Lines of this file are not shown. View the raw message.

testcases/kernel/fs/fs_bind/rbind/fs_bind_rbind17.sh new file +50 -0

50 lines not on this page · raw message

testcases/kernel/fs/fs_bind/rbind/fs_bind_rbind18.sh new file +50 -0

50 lines not on this page · raw message

testcases/kernel/fs/fs_bind/rbind/fs_bind_rbind19.sh new file +53 -0

53 lines not on this page · raw message

testcases/kernel/fs/fs_bind/rbind/fs_bind_rbind20.sh new file +50 -0

50 lines not on this page · raw message

testcases/kernel/fs/fs_bind/rbind/fs_bind_rbind21.sh new file +56 -0

56 lines not on this page · raw message

testcases/kernel/fs/fs_bind/rbind/fs_bind_rbind22.sh new file +49 -0

49 lines not on this page · raw message

testcases/kernel/fs/fs_bind/rbind/fs_bind_rbind23.sh new file +49 -0

49 lines not on this page · raw message

testcases/kernel/fs/fs_bind/rbind/fs_bind_rbind24.sh new file +49 -0

49 lines not on this page · raw message

testcases/kernel/fs/fs_bind/rbind/fs_bind_rbind25.sh new file +56 -0

56 lines not on this page · raw message

testcases/kernel/fs/fs_bind/rbind/fs_bind_rbind26.sh new file +51 -0

51 lines not on this page · raw message

testcases/kernel/fs/fs_bind/rbind/fs_bind_rbind27.sh new file +56 -0

56 lines not on this page · raw message

testcases/kernel/fs/fs_bind/rbind/fs_bind_rbind28.sh new file +51 -0

51 lines not on this page · raw message

testcases/kernel/fs/fs_bind/rbind/fs_bind_rbind29.sh new file +43 -0

43 lines not on this page · raw message

testcases/kernel/fs/fs_bind/rbind/fs_bind_rbind30.sh new file +38 -0
new file mode 100755
index 000000000..09df7002c

Lines of this file are not shown. View the raw message.

testcases/kernel/fs/fs_bind/rbind/fs_bind_rbind31.sh new file +45 -0

45 lines not on this page · raw message

testcases/kernel/fs/fs_bind/rbind/fs_bind_rbind32.sh new file +38 -0
new file mode 100755
index 000000000..3d68283c0

Lines of this file are not shown. View the raw message.

testcases/kernel/fs/fs_bind/rbind/fs_bind_rbind33.sh new file +59 -0

59 lines not on this page · raw message

testcases/kernel/fs/fs_bind/rbind/fs_bind_rbind34.sh new file +43 -0

43 lines not on this page · raw message

testcases/kernel/fs/fs_bind/rbind/fs_bind_rbind35.sh new file +46 -0

46 lines not on this page · raw message

testcases/kernel/fs/fs_bind/rbind/fs_bind_rbind36.sh new file +41 -0

41 lines not on this page · raw message

testcases/kernel/fs/fs_bind/rbind/fs_bind_rbind37.sh new file +55 -0

55 lines not on this page · raw message

testcases/kernel/fs/fs_bind/rbind/fs_bind_rbind38.sh new file +54 -0

54 lines not on this page · raw message

testcases/kernel/fs/fs_bind/rbind/fs_bind_rbind39.sh new file +31 -0
new file mode 100755
index 000000000..697c7dd00

Lines of this file are not shown. View the raw message.

testcases/kernel/fs/fs_bind/rbind/test01 deleted +0 -98

98 lines not on this page · raw message

testcases/kernel/fs/fs_bind/rbind/test02 deleted +0 -97

97 lines not on this page · raw message

testcases/kernel/fs/fs_bind/rbind/test03 deleted +0 -118

118 lines not on this page · raw message

testcases/kernel/fs/fs_bind/rbind/test04 deleted +0 -104

104 lines not on this page · raw message

testcases/kernel/fs/fs_bind/rbind/test05 deleted +0 -113

113 lines not on this page · raw message

testcases/kernel/fs/fs_bind/rbind/test06 deleted +0 -102

102 lines not on this page · raw message

testcases/kernel/fs/fs_bind/rbind/test07 deleted +0 -113

113 lines not on this page · raw message

testcases/kernel/fs/fs_bind/rbind/test07-2 deleted +0 -69

69 lines not on this page · raw message

testcases/kernel/fs/fs_bind/rbind/test08 deleted +0 -103

103 lines not on this page · raw message

testcases/kernel/fs/fs_bind/rbind/test09 deleted +0 -113

113 lines not on this page · raw message

testcases/kernel/fs/fs_bind/rbind/test10 deleted +0 -108

108 lines not on this page · raw message

testcases/kernel/fs/fs_bind/rbind/test11 deleted +0 -117

117 lines not on this page · raw message

testcases/kernel/fs/fs_bind/rbind/test12 deleted +0 -108

108 lines not on this page · raw message

testcases/kernel/fs/fs_bind/rbind/test13 deleted +0 -94

94 lines not on this page · raw message

testcases/kernel/fs/fs_bind/rbind/test14 deleted +0 -86

86 lines not on this page · raw message

testcases/kernel/fs/fs_bind/rbind/test15 deleted +0 -97

97 lines not on this page · raw message

testcases/kernel/fs/fs_bind/rbind/test16 deleted +0 -87

87 lines not on this page · raw message

testcases/kernel/fs/fs_bind/rbind/test17 deleted +0 -98

98 lines not on this page · raw message

testcases/kernel/fs/fs_bind/rbind/test18 deleted +0 -98

98 lines not on this page · raw message

testcases/kernel/fs/fs_bind/rbind/test19 deleted +0 -108

108 lines not on this page · raw message

testcases/kernel/fs/fs_bind/rbind/test20 deleted +0 -98

98 lines not on this page · raw message

testcases/kernel/fs/fs_bind/rbind/test21 deleted +0 -106

106 lines not on this page · raw message

testcases/kernel/fs/fs_bind/rbind/test22 deleted +0 -99

99 lines not on this page · raw message

testcases/kernel/fs/fs_bind/rbind/test23 deleted +0 -101

101 lines not on this page · raw message

testcases/kernel/fs/fs_bind/rbind/test24 deleted +0 -101

101 lines not on this page · raw message

testcases/kernel/fs/fs_bind/rbind/test25 deleted +0 -106

106 lines not on this page · raw message

testcases/kernel/fs/fs_bind/rbind/test26 deleted +0 -98

98 lines not on this page · raw message

testcases/kernel/fs/fs_bind/rbind/test27 deleted +0 -104

104 lines not on this page · raw message

testcases/kernel/fs/fs_bind/rbind/test28 deleted +0 -99

99 lines not on this page · raw message

testcases/kernel/fs/fs_bind/rbind/test29 deleted +0 -91

91 lines not on this page · raw message

testcases/kernel/fs/fs_bind/rbind/test30 deleted +0 -86

86 lines not on this page · raw message

testcases/kernel/fs/fs_bind/rbind/test31 deleted +0 -93

93 lines not on this page · raw message

testcases/kernel/fs/fs_bind/rbind/test32 deleted +0 -86

86 lines not on this page · raw message

testcases/kernel/fs/fs_bind/rbind/test33 deleted +0 -114

114 lines not on this page · raw message

testcases/kernel/fs/fs_bind/rbind/test34 deleted +0 -93

93 lines not on this page · raw message

testcases/kernel/fs/fs_bind/rbind/test35 deleted +0 -95

95 lines not on this page · raw message

testcases/kernel/fs/fs_bind/rbind/test36 deleted +0 -91

91 lines not on this page · raw message

testcases/kernel/fs/fs_bind/rbind/test37 deleted +0 -102

102 lines not on this page · raw message

testcases/kernel/fs/fs_bind/rbind/test38 deleted +0 -101

101 lines not on this page · raw message

testcases/kernel/fs/fs_bind/rbind/test39 deleted +0 -78

78 lines not on this page · raw message

testcases/kernel/fs/fs_bind/regression/00_Descriptions.txt deleted +0 -44

44 lines not on this page · raw message

testcases/kernel/fs/fs_bind/regression/test01 deleted +0 -71

71 lines not on this page · raw message

testcases/kernel/fs/fs_bind/regression/test02 deleted +0 -78

78 lines not on this page · raw message

testcases/kernel/fs/fs_bind/regression/test03 deleted +0 -77

77 lines not on this page · raw message

testscripts/test_fs_bind.sh deleted +0 -526

526 lines not on this page · raw message

The rest of this diff is not shown. View the raw message.

Signature · 1 line
2.25.1

Part of the diff is not shown here. View the raw message.

#2 lore raw

PATCH 1/1 fs_bind: Convert to ltp tests

Hello Joerg,

Quoted 15 lines · Joerg Vehlow
testcases/kernel/fs/fs_bind/cloneNS/fs_bind_cloneNS02.sh new file +9 -0
new file mode 100755
index 000000000..9e0f5fe05
@@ -0,0 +1,53 @@
+#!/bin/sh
+# SPDX-License-Identifier: GPL-2.0-or-later
+# Copyright (c) International Business Machines  Corp., 2005
+# Copyright (c) 2021 Joerg Vehlow <[email protected]>
+# Author: Avantika Mathur ([email protected])
+
+FS_BIND_TESTFUNC=test
+
+. fs_bind_lib.sh

testcases/kernel/fs/fs_bind/cloneNS/fs_bind_cloneNS02.sh line 19

Quoted 10 lines
testcases/kernel/fs/fs_bind/cloneNS/fs_bind_cloneNS02.sh new file +10 -0
+
+test()
+{
+    tst_res TINFO "cloneNS: namespaces with parent-slave"
+
+	fs_bind_makedir rshared dir1
+	EXPECT_PASS mount --bind "$FS_BIND_DISK1" dir1
+
+	mkdir dir2
+	EXPECT_PASS mount --bind dir1 dir2

There seems to be a section of tabs instead of spaces here. Also in other places.

I wonder how you converted these?

Looks promising.

Signature · 2 lines
Thank you,
Richard.
#3 lore raw

PATCH 1/1 fs_bind: Convert to ltp tests

Hi Richard,

Quoted 23 lines · Richard Palethorpe

Hello Joerg,

Quoted 19 lines · Joerg Vehlow
testcases/kernel/fs/fs_bind/cloneNS/fs_bind_cloneNS02.sh new file +13 -0
new file mode 100755
index 000000000..9e0f5fe05
@@ -0,0 +1,53 @@
+#!/bin/sh
+# SPDX-License-Identifier: GPL-2.0-or-later
+# Copyright (c) International Business Machines  Corp., 2005
+# Copyright (c) 2021 Joerg Vehlow <[email protected]>
+# Author: Avantika Mathur ([email protected])
+
+FS_BIND_TESTFUNC=test
+
+. fs_bind_lib.sh
+
+test()
+{
+    tst_res TINFO "cloneNS: namespaces with parent-slave"
Quoted 8 lines

testcases/kernel/fs/fs_bind/cloneNS/fs_bind_cloneNS02.sh line 19

Quoted 6 lines
testcases/kernel/fs/fs_bind/cloneNS/fs_bind_cloneNS02.sh new file +6 -0
+
+	fs_bind_makedir rshared dir1
+	EXPECT_PASS mount --bind "$FS_BIND_DISK1" dir1
+
+	mkdir dir2
+	EXPECT_PASS mount --bind dir1 dir2

There seems to be a section of tabs instead of spaces here. Also in other places.

Hmm strange. But I'd say rather spaces instead of tabs in some places. As far as I see ltp mostly uses tabs and not spaces.
I guess mixed tab/spaces is an artifact from the way I worked on the tests. fs_bind was mixed spaces/tabs to begin with and I did not check. I will fix this for a v2.

Quoted 1 line

I wonder how you converted these?

It was a mixed approach:
1. Try to understand the building blocks and reimplement them as a shell code library instead of several binaries.
I also realized, that nothing implemented in test_fs_bind.sh was really required (except for creating the "sandbox").
I replaced the mount and /proc/mount checks with just a /proc/mount check, because I don't see a reason to do
two checks, that should be based on the same data (mount and /proc/mount).
2. Convert some tests manually and adapt library.
I did multiple rewrites of some functions and especially of the unmounting code.
At first I was trying to collect all mounts in the library, to know what has to be unmounted,
but due to the nature of bind and move mounts, this is not really possible without extensive logic.
3. Convert lots of tests automatically using a python script. The structure of most tests was them same
(there are hints that the test boilerplate was automatically generated from some other source.)
This only required minor manual changes
4. Understand convert and fix the cloneNS tests. This was one of the bigger challenges, because
these tests were not executed since they were committed 13 years ago and had some bugs.
I am not even sure if the boilerplate for these tests was correct, but it was good enough, to understand
what it was supposed to do.

Quoted 3 lines

Looks promising.

#4 lore raw

cover fs_bind: Convert to ltp tests

In reply to Joerg Vehlow

Hello Joerg,

Quoted 7 lines · Joerg Vehlow

Hi everyone,

I know this is a huge changeset, but there is not really a good way to break it down into multiple commits. Every step in between would either lead to a broken test suite or a change, that is then changed again. So I made this one huge commit, that converts all of the tests of the testsuite in one go.

It seems like there are no file renames (according to Git), but many files are deleted and created. So you could split the commit into a deletion patch and a creation patch.

I guess the deletion patch might have to remove some runtest file entries temporarily? However I don't see a big problem with that.

Quoted 8 lines

I added some minor bugfixes especially added umounts, because some where missing and some were redundant. I also dropped all useless output (bare ls).

I may have overused EXPECT_PASS a bit here, but I think it does not do any harm, if all mounts are checked.

Joerg

Signature · 2 lines
Thank you,
Richard.
#5 lore raw

cover fs_bind: Convert to ltp tests

Hi Richard,

Quoted 11 lines · Richard Palethorpe

Hello Joerg,

Quoted 7 lines · Joerg Vehlow

Hi everyone,

I know this is a huge changeset, but there is not really a good way to break it down into multiple commits. Every step in between would either lead to a broken test suite or a change, that is then changed again. So I made this one huge commit, that converts all of the tests of the testsuite in one go.

Quoted 6 lines

It seems like there are no file renames (according to Git), but many files are deleted and created. So you could split the commit into a deletion patch and a creation patch.

I guess the deletion patch might have to remove some runtest file entries temporarily? However I don't see a big problem with that.

Actually most deletions are renames, that git just did not pick up, because of the immense
changes in the tests.
I could add two patches:
1. rename (And delete old testrunner stuff and runtest entries)
2. Apply all changes

This should allow better review of the actual changes, at least for most tests.

J?rg

#6 lore raw

cover fs_bind: Convert to ltp tests

Hello Joerg,

Quoted 27 lines · Joerg Vehlow

Hi Richard,

Quoted 11 lines · Richard Palethorpe

Hello Joerg,

Quoted 7 lines · Joerg Vehlow

Hi everyone,

I know this is a huge changeset, but there is not really a good way to break it down into multiple commits. Every step in between would either lead to a broken test suite or a change, that is then changed again. So I made this one huge commit, that converts all of the tests of the testsuite in one go.

Quoted 6 lines

It seems like there are no file renames (according to Git), but many files are deleted and created. So you could split the commit into a deletion patch and a creation patch.

I guess the deletion patch might have to remove some runtest file entries temporarily? However I don't see a big problem with that.

Actually most deletions are renames, that git just did not pick up, because of the immense
changes in the tests.
I could add two patches:
1. rename (And delete old testrunner stuff and runtest entries)
2. Apply all changes

Quoted 2 lines

This should allow better review of the actual changes, at least for most tests.

Sounds good. Also will improve the Git history.

Quoted 2 lines

J?rg

Signature · 2 lines
Thank you,
Richard.