Browse Source

Revamp test script file tree hierarchy

This new hierarchy makes it easier to work simultaneously on data and
the script, simplifies deployment to tempdir and makes the launching
script naming consistent with simple.sh.
Alois Mahdal 9 years ago
parent
commit
052a8cc7da
100 changed files with 3 additions and 5 deletions
  1. 3
    5
      test/include/harness.sh
  2. 0
    0
      test/tests/config_cfgrep/TF_RUN
  3. 0
    0
      test/tests/config_cfgrep/both_keys_and_sections
  4. 0
    0
      test/tests/config_cfgrep/both_keys_and_sections.oracle.stdout
  5. 0
    0
      test/tests/config_cfgrep/games_with_spaces
  6. 0
    0
      test/tests/config_cfgrep/games_with_spaces.oracle.stdout
  7. 0
    0
      test/tests/config_cfgrep/keys_only
  8. 0
    0
      test/tests/config_cfgrep/keys_only.oracle.stdout
  9. 0
    0
      test/tests/config_cfgrep/keys_sections_spaces
  10. 0
    0
      test/tests/config_cfgrep/keys_sections_spaces.oracle.stdout
  11. 0
    0
      test/tests/config_cfgrep/list_keys
  12. 0
    0
      test/tests/config_cfgrep/list_keys.oracle.stdout
  13. 0
    0
      test/tests/config_cfgrep/list_paths
  14. 0
    0
      test/tests/config_cfgrep/list_paths.oracle.stdout
  15. 0
    0
      test/tests/config_cfgrep/list_sections
  16. 0
    0
      test/tests/config_cfgrep/list_sections.oracle.stdout
  17. 0
    0
      test/tests/config_cfgrep/list_tricky_all_keys
  18. 0
    0
      test/tests/config_cfgrep/list_tricky_all_keys.oracle.stdout
  19. 0
    0
      test/tests/config_cfgrep/list_tricky_all_paths
  20. 0
    0
      test/tests/config_cfgrep/list_tricky_all_paths.oracle.stdout
  21. 0
    0
      test/tests/config_cfgrep/list_tricky_all_sections
  22. 0
    0
      test/tests/config_cfgrep/list_tricky_all_sections.oracle.stdout
  23. 0
    0
      test/tests/config_cfgrep/list_tricky_k12_keys
  24. 0
    0
      test/tests/config_cfgrep/list_tricky_k12_keys.oracle.stdout
  25. 0
    0
      test/tests/config_cfgrep/list_tricky_k12_paths
  26. 0
    0
      test/tests/config_cfgrep/list_tricky_k12_paths.oracle.stdout
  27. 0
    0
      test/tests/config_cfgrep/list_tricky_k12_sections
  28. 0
    0
      test/tests/config_cfgrep/list_tricky_k12_sections.oracle.stdout
  29. 0
    0
      test/tests/config_cfgrep/list_tricky_s1_keys
  30. 0
    0
      test/tests/config_cfgrep/list_tricky_s1_keys.oracle.stdout
  31. 0
    0
      test/tests/config_cfgrep/list_tricky_s1_paths
  32. 0
    0
      test/tests/config_cfgrep/list_tricky_s1_paths.oracle.stdout
  33. 0
    0
      test/tests/config_cfgrep/list_tricky_s1_sections
  34. 0
    0
      test/tests/config_cfgrep/list_tricky_s1_sections.oracle.stdout
  35. 0
    0
      test/tests/config_cfgrep/merge-a/t.conf
  36. 0
    0
      test/tests/config_cfgrep/merge-b/t.conf
  37. 0
    0
      test/tests/config_cfgrep/merge_first
  38. 0
    0
      test/tests/config_cfgrep/merge_first.oracle.stdout
  39. 0
    0
      test/tests/config_cfgrep/merge_first_no1
  40. 0
    0
      test/tests/config_cfgrep/merge_first_no1.oracle.stdout
  41. 0
    0
      test/tests/config_cfgrep/merge_first_no2
  42. 0
    0
      test/tests/config_cfgrep/merge_first_no2.oracle.stdout
  43. 0
    0
      test/tests/config_cfgrep/merge_first_no3
  44. 0
    0
      test/tests/config_cfgrep/merge_first_no3.oracle.stdout
  45. 0
    0
      test/tests/config_cfgrep/merge_first_none
  46. 0
    0
      test/tests/config_cfgrep/merge_first_none.oracle.stdout
  47. 0
    0
      test/tests/config_cfgrep/merge_first_strict
  48. 0
    0
      test/tests/config_cfgrep/merge_first_strict.oracle.stdout
  49. 0
    0
      test/tests/config_cfgrep/merge_join
  50. 0
    0
      test/tests/config_cfgrep/merge_join.oracle.stdout
  51. 0
    0
      test/tests/config_cfgrep/merge_join_no1
  52. 0
    0
      test/tests/config_cfgrep/merge_join_no1.oracle.stdout
  53. 0
    0
      test/tests/config_cfgrep/merge_join_no2
  54. 0
    0
      test/tests/config_cfgrep/merge_join_no2.oracle.stdout
  55. 0
    0
      test/tests/config_cfgrep/merge_join_no3
  56. 0
    0
      test/tests/config_cfgrep/merge_join_no3.oracle.stdout
  57. 0
    0
      test/tests/config_cfgrep/merge_join_none
  58. 0
    0
      test/tests/config_cfgrep/merge_join_none.oracle.stdout
  59. 0
    0
      test/tests/config_cfgrep/merge_join_strict
  60. 0
    0
      test/tests/config_cfgrep/merge_join_strict.oracle.stdout
  61. 0
    0
      test/tests/config_cfgrep/path
  62. 0
    0
      test/tests/config_cfgrep/path.oracle.stdout
  63. 0
    0
      test/tests/config_cfgrep/plain
  64. 0
    0
      test/tests/config_cfgrep/plain.oracle.stdout
  65. 0
    0
      test/tests/config_cfgrep/plain_strict
  66. 0
    0
      test/tests/config_cfgrep/plain_strict.oracle.stdout
  67. 0
    0
      test/tests/config_cfgrep/sections_only
  68. 0
    0
      test/tests/config_cfgrep/sections_only.oracle.stdout
  69. 0
    0
      test/tests/config_cfgrep/strict_and_space
  70. 0
    0
      test/tests/config_cfgrep/strict_and_space.oracle.stdout
  71. 0
    0
      test/tests/config_cfgrep/strict_and_tab
  72. 0
    0
      test/tests/config_cfgrep/strict_and_tab.oracle.stdout
  73. 0
    0
      test/tests/config_cfgrep/tricks_with_strange_naming
  74. 0
    0
      test/tests/config_cfgrep/tricks_with_strange_naming.oracle.stdout
  75. 0
    0
      test/tests/ffoo_api/TF_RUN
  76. 0
    0
      test/tests/ffoo_api/functions
  77. 0
    0
      test/tests/ffoo_api/functions.oracle.stdout
  78. 0
    0
      test/tests/ffoo_api/modules
  79. 0
    0
      test/tests/ffoo_api/modules.oracle.stdout
  80. 0
    0
      test/tests/ffoo_import/TF_RUN
  81. 0
    0
      test/tests/ffoo_import/import_fn
  82. 0
    0
      test/tests/ffoo_import/import_fn.oracle
  83. 0
    0
      test/tests/ffoo_import/import_fn.oracle.stdout
  84. 0
    0
      test/tests/ffoo_import/import_submodule
  85. 0
    0
      test/tests/ffoo_import/import_submodule.oracle
  86. 0
    0
      test/tests/ffoo_import/import_submodule.oracle.stdout
  87. 0
    0
      test/tests/ffoo_import/import_var
  88. 0
    0
      test/tests/ffoo_import/import_var.oracle
  89. 0
    0
      test/tests/ffoo_import/import_var.oracle.stdout
  90. 0
    0
      test/tests/ffoo_import/import_var_fn
  91. 0
    0
      test/tests/ffoo_import/import_var_fn.oracle
  92. 0
    0
      test/tests/ffoo_import/import_var_fn.oracle.stdout
  93. 0
    0
      test/tests/ffoo_import/include/mod_f.sh
  94. 0
    0
      test/tests/ffoo_import/include/mod_v.sh
  95. 0
    0
      test/tests/ffoo_import/include/mod_v_f.sh
  96. 0
    0
      test/tests/ffoo_import/include/sub/mod.sh
  97. 0
    0
      test/tests/ffoo_import/try_import_fn
  98. 0
    0
      test/tests/ffoo_import/try_import_fn.oracle
  99. 0
    0
      test/tests/ffoo_import/try_import_fn.oracle.stdout
  100. 0
    0
      test/tests/ffoo_import/try_import_submodule

+ 3
- 5
test/include/harness.sh View File

@@ -15,7 +15,7 @@ tf_has_files() {
15 15
 }
16 16
 
17 17
 tf_enum_tests() {
18
-    find test/scripts -maxdepth 1 -type f -perm /111 | cut -d/ -f3-
18
+    find test/tests -mindepth 2 -maxdepth 2 -type f -perm /111 | cut -d/ -f3
19 19
 }
20 20
 
21 21
 tf_run_tests() {
@@ -28,12 +28,10 @@ tf_run_tests() {
28 28
     do
29 29
         tf_think "... $tname"
30 30
         tmpdir=$(mktemp -d)
31
-        datadir="$TF_PROJDIR/test/data/$tname"
32 31
         stamp=$(date +artifacts-$tname-%Y%m%d-%H%M%S)
33 32
         pushd $tmpdir >/dev/null
34
-            cp -r "$TF_PROJDIR/test/scripts/$tname" .
35
-            tf_has_files "$datadir" && cp -r "$datadir/"* .
36
-            TF_TNAME="$tname" ./$tname
33
+            cp -r "$TF_PROJDIR/test/tests/$tname/"* .
34
+            TF_TNAME="$tname" ./TF_RUN
37 35
             tes=$?
38 36
             case $tes in
39 37
                 0|2)        # ok    | bailout (skipped)

test/scripts/config_cfgrep → test/tests/config_cfgrep/TF_RUN View File


test/data/config_cfgrep/both_keys_and_sections → test/tests/config_cfgrep/both_keys_and_sections View File


test/data/config_cfgrep/both_keys_and_sections.oracle.stdout → test/tests/config_cfgrep/both_keys_and_sections.oracle.stdout View File


test/data/config_cfgrep/games_with_spaces → test/tests/config_cfgrep/games_with_spaces View File


test/data/config_cfgrep/games_with_spaces.oracle.stdout → test/tests/config_cfgrep/games_with_spaces.oracle.stdout View File


test/data/config_cfgrep/keys_only → test/tests/config_cfgrep/keys_only View File


test/data/config_cfgrep/keys_only.oracle.stdout → test/tests/config_cfgrep/keys_only.oracle.stdout View File


test/data/config_cfgrep/keys_sections_spaces → test/tests/config_cfgrep/keys_sections_spaces View File


test/data/config_cfgrep/keys_sections_spaces.oracle.stdout → test/tests/config_cfgrep/keys_sections_spaces.oracle.stdout View File


test/data/config_cfgrep/list_keys → test/tests/config_cfgrep/list_keys View File


test/data/config_cfgrep/list_keys.oracle.stdout → test/tests/config_cfgrep/list_keys.oracle.stdout View File


test/data/config_cfgrep/list_paths → test/tests/config_cfgrep/list_paths View File


test/data/config_cfgrep/list_paths.oracle.stdout → test/tests/config_cfgrep/list_paths.oracle.stdout View File


test/data/config_cfgrep/list_sections → test/tests/config_cfgrep/list_sections View File


test/data/config_cfgrep/list_sections.oracle.stdout → test/tests/config_cfgrep/list_sections.oracle.stdout View File


test/data/config_cfgrep/list_tricky_all_keys → test/tests/config_cfgrep/list_tricky_all_keys View File


test/data/config_cfgrep/list_tricky_all_keys.oracle.stdout → test/tests/config_cfgrep/list_tricky_all_keys.oracle.stdout View File


test/data/config_cfgrep/list_tricky_all_paths → test/tests/config_cfgrep/list_tricky_all_paths View File


test/data/config_cfgrep/list_tricky_all_paths.oracle.stdout → test/tests/config_cfgrep/list_tricky_all_paths.oracle.stdout View File


test/data/config_cfgrep/list_tricky_all_sections → test/tests/config_cfgrep/list_tricky_all_sections View File


test/data/config_cfgrep/list_tricky_all_sections.oracle.stdout → test/tests/config_cfgrep/list_tricky_all_sections.oracle.stdout View File


test/data/config_cfgrep/list_tricky_k12_keys → test/tests/config_cfgrep/list_tricky_k12_keys View File


test/data/config_cfgrep/list_tricky_k12_keys.oracle.stdout → test/tests/config_cfgrep/list_tricky_k12_keys.oracle.stdout View File


test/data/config_cfgrep/list_tricky_k12_paths → test/tests/config_cfgrep/list_tricky_k12_paths View File


test/data/config_cfgrep/list_tricky_k12_paths.oracle.stdout → test/tests/config_cfgrep/list_tricky_k12_paths.oracle.stdout View File


test/data/config_cfgrep/list_tricky_k12_sections → test/tests/config_cfgrep/list_tricky_k12_sections View File


test/data/config_cfgrep/list_tricky_k12_sections.oracle.stdout → test/tests/config_cfgrep/list_tricky_k12_sections.oracle.stdout View File


test/data/config_cfgrep/list_tricky_s1_keys → test/tests/config_cfgrep/list_tricky_s1_keys View File


test/data/config_cfgrep/list_tricky_s1_keys.oracle.stdout → test/tests/config_cfgrep/list_tricky_s1_keys.oracle.stdout View File


test/data/config_cfgrep/list_tricky_s1_paths → test/tests/config_cfgrep/list_tricky_s1_paths View File


test/data/config_cfgrep/list_tricky_s1_paths.oracle.stdout → test/tests/config_cfgrep/list_tricky_s1_paths.oracle.stdout View File


test/data/config_cfgrep/list_tricky_s1_sections → test/tests/config_cfgrep/list_tricky_s1_sections View File


test/data/config_cfgrep/list_tricky_s1_sections.oracle.stdout → test/tests/config_cfgrep/list_tricky_s1_sections.oracle.stdout View File


test/data/config_cfgrep/merge-a/t.conf → test/tests/config_cfgrep/merge-a/t.conf View File


test/data/config_cfgrep/merge-b/t.conf → test/tests/config_cfgrep/merge-b/t.conf View File


test/data/config_cfgrep/merge_first → test/tests/config_cfgrep/merge_first View File


test/data/config_cfgrep/merge_first.oracle.stdout → test/tests/config_cfgrep/merge_first.oracle.stdout View File


test/data/config_cfgrep/merge_first_no1 → test/tests/config_cfgrep/merge_first_no1 View File


test/data/config_cfgrep/merge_first_no1.oracle.stdout → test/tests/config_cfgrep/merge_first_no1.oracle.stdout View File


test/data/config_cfgrep/merge_first_no2 → test/tests/config_cfgrep/merge_first_no2 View File


test/data/config_cfgrep/merge_first_no2.oracle.stdout → test/tests/config_cfgrep/merge_first_no2.oracle.stdout View File


test/data/config_cfgrep/merge_first_no3 → test/tests/config_cfgrep/merge_first_no3 View File


test/data/config_cfgrep/merge_first_no3.oracle.stdout → test/tests/config_cfgrep/merge_first_no3.oracle.stdout View File


test/data/config_cfgrep/merge_first_none → test/tests/config_cfgrep/merge_first_none View File


test/data/config_cfgrep/merge_first_none.oracle.stdout → test/tests/config_cfgrep/merge_first_none.oracle.stdout View File


test/data/config_cfgrep/merge_first_strict → test/tests/config_cfgrep/merge_first_strict View File


test/data/config_cfgrep/merge_first_strict.oracle.stdout → test/tests/config_cfgrep/merge_first_strict.oracle.stdout View File


test/data/config_cfgrep/merge_join → test/tests/config_cfgrep/merge_join View File


test/data/config_cfgrep/merge_join.oracle.stdout → test/tests/config_cfgrep/merge_join.oracle.stdout View File


test/data/config_cfgrep/merge_join_no1 → test/tests/config_cfgrep/merge_join_no1 View File


test/data/config_cfgrep/merge_join_no1.oracle.stdout → test/tests/config_cfgrep/merge_join_no1.oracle.stdout View File


test/data/config_cfgrep/merge_join_no2 → test/tests/config_cfgrep/merge_join_no2 View File


test/data/config_cfgrep/merge_join_no2.oracle.stdout → test/tests/config_cfgrep/merge_join_no2.oracle.stdout View File


test/data/config_cfgrep/merge_join_no3 → test/tests/config_cfgrep/merge_join_no3 View File


test/data/config_cfgrep/merge_join_no3.oracle.stdout → test/tests/config_cfgrep/merge_join_no3.oracle.stdout View File


test/data/config_cfgrep/merge_join_none → test/tests/config_cfgrep/merge_join_none View File


test/data/config_cfgrep/merge_join_none.oracle.stdout → test/tests/config_cfgrep/merge_join_none.oracle.stdout View File


test/data/config_cfgrep/merge_join_strict → test/tests/config_cfgrep/merge_join_strict View File


test/data/config_cfgrep/merge_join_strict.oracle.stdout → test/tests/config_cfgrep/merge_join_strict.oracle.stdout View File


test/data/config_cfgrep/path → test/tests/config_cfgrep/path View File


test/data/config_cfgrep/path.oracle.stdout → test/tests/config_cfgrep/path.oracle.stdout View File


test/data/config_cfgrep/plain → test/tests/config_cfgrep/plain View File


test/data/config_cfgrep/plain.oracle.stdout → test/tests/config_cfgrep/plain.oracle.stdout View File


test/data/config_cfgrep/plain_strict → test/tests/config_cfgrep/plain_strict View File


test/data/config_cfgrep/plain_strict.oracle.stdout → test/tests/config_cfgrep/plain_strict.oracle.stdout View File


test/data/config_cfgrep/sections_only → test/tests/config_cfgrep/sections_only View File


test/data/config_cfgrep/sections_only.oracle.stdout → test/tests/config_cfgrep/sections_only.oracle.stdout View File


test/data/config_cfgrep/strict_and_space → test/tests/config_cfgrep/strict_and_space View File


test/data/config_cfgrep/strict_and_space.oracle.stdout → test/tests/config_cfgrep/strict_and_space.oracle.stdout View File


test/data/config_cfgrep/strict_and_tab → test/tests/config_cfgrep/strict_and_tab View File


test/data/config_cfgrep/strict_and_tab.oracle.stdout → test/tests/config_cfgrep/strict_and_tab.oracle.stdout View File


test/data/config_cfgrep/tricks_with_strange_naming → test/tests/config_cfgrep/tricks_with_strange_naming View File


test/data/config_cfgrep/tricks_with_strange_naming.oracle.stdout → test/tests/config_cfgrep/tricks_with_strange_naming.oracle.stdout View File


test/scripts/ffoo_api → test/tests/ffoo_api/TF_RUN View File


test/data/ffoo_api/functions → test/tests/ffoo_api/functions View File


test/data/ffoo_api/functions.oracle.stdout → test/tests/ffoo_api/functions.oracle.stdout View File


test/data/ffoo_api/modules → test/tests/ffoo_api/modules View File


test/data/ffoo_api/modules.oracle.stdout → test/tests/ffoo_api/modules.oracle.stdout View File


test/scripts/ffoo_import → test/tests/ffoo_import/TF_RUN View File


test/data/ffoo_import/import_fn → test/tests/ffoo_import/import_fn View File


test/data/ffoo_import/import_fn.oracle → test/tests/ffoo_import/import_fn.oracle View File


test/data/ffoo_import/import_fn.oracle.stdout → test/tests/ffoo_import/import_fn.oracle.stdout View File


test/data/ffoo_import/import_submodule → test/tests/ffoo_import/import_submodule View File


test/data/ffoo_import/import_submodule.oracle → test/tests/ffoo_import/import_submodule.oracle View File


test/data/ffoo_import/import_submodule.oracle.stdout → test/tests/ffoo_import/import_submodule.oracle.stdout View File


test/data/ffoo_import/import_var → test/tests/ffoo_import/import_var View File


test/data/ffoo_import/import_var.oracle → test/tests/ffoo_import/import_var.oracle View File


test/data/ffoo_import/import_var.oracle.stdout → test/tests/ffoo_import/import_var.oracle.stdout View File


test/data/ffoo_import/import_var_fn → test/tests/ffoo_import/import_var_fn View File


test/data/ffoo_import/import_var_fn.oracle → test/tests/ffoo_import/import_var_fn.oracle View File


test/data/ffoo_import/import_var_fn.oracle.stdout → test/tests/ffoo_import/import_var_fn.oracle.stdout View File


test/data/ffoo_import/include/mod_f.sh → test/tests/ffoo_import/include/mod_f.sh View File


test/data/ffoo_import/include/mod_v.sh → test/tests/ffoo_import/include/mod_v.sh View File


test/data/ffoo_import/include/mod_v_f.sh → test/tests/ffoo_import/include/mod_v_f.sh View File


test/data/ffoo_import/include/sub/mod.sh → test/tests/ffoo_import/include/sub/mod.sh View File


test/data/ffoo_import/try_import_fn → test/tests/ffoo_import/try_import_fn View File


test/data/ffoo_import/try_import_fn.oracle → test/tests/ffoo_import/try_import_fn.oracle View File


test/data/ffoo_import/try_import_fn.oracle.stdout → test/tests/ffoo_import/try_import_fn.oracle.stdout View File


test/data/ffoo_import/try_import_submodule → test/tests/ffoo_import/try_import_submodule View File


Some files were not shown because too many files changed in this diff