Przeglądaj źródła

Add support for comparing stderr as well

Alois Mahdal 10 lat temu
rodzic
commit
0025cbf46e
29 zmienionych plików z 4 dodań i 2 usunięć
  1. 0
    0
      test/data/config_cfgrep/both_keys_and_sections.stdout.oracle
  2. 0
    0
      test/data/config_cfgrep/games_with_spaces.stdout.oracle
  3. 0
    0
      test/data/config_cfgrep/keys_only.stdout.oracle
  4. 0
    0
      test/data/config_cfgrep/keys_sections_spaces.stdout.oracle
  5. 0
    0
      test/data/config_cfgrep/list_keys.stdout.oracle
  6. 0
    0
      test/data/config_cfgrep/list_paths.stdout.oracle
  7. 0
    0
      test/data/config_cfgrep/list_sections.stdout.oracle
  8. 0
    0
      test/data/config_cfgrep/merge_first.stdout.oracle
  9. 0
    0
      test/data/config_cfgrep/merge_first_no1.stdout.oracle
  10. 0
    0
      test/data/config_cfgrep/merge_first_no2.stdout.oracle
  11. 0
    0
      test/data/config_cfgrep/merge_first_no3.stdout.oracle
  12. 0
    0
      test/data/config_cfgrep/merge_first_none.stdout.oracle
  13. 0
    0
      test/data/config_cfgrep/merge_first_strict.stdout.oracle
  14. 0
    0
      test/data/config_cfgrep/merge_join.stdout.oracle
  15. 0
    0
      test/data/config_cfgrep/merge_join_no1.stdout.oracle
  16. 0
    0
      test/data/config_cfgrep/merge_join_no2.stdout.oracle
  17. 0
    0
      test/data/config_cfgrep/merge_join_no3.stdout.oracle
  18. 0
    0
      test/data/config_cfgrep/merge_join_none.stdout.oracle
  19. 0
    0
      test/data/config_cfgrep/merge_join_strict.stdout.oracle
  20. 0
    0
      test/data/config_cfgrep/path.stdout.oracle
  21. 0
    0
      test/data/config_cfgrep/plain.stdout.oracle
  22. 0
    0
      test/data/config_cfgrep/plain_strict.stdout.oracle
  23. 0
    0
      test/data/config_cfgrep/sections_only.stdout.oracle
  24. 0
    0
      test/data/config_cfgrep/strict_and_space.stdout.oracle
  25. 0
    0
      test/data/config_cfgrep/strict_and_tab.stdout.oracle
  26. 0
    0
      test/data/config_cfgrep/tricks_with_strange_naming.stdout.oracle
  27. 0
    0
      test/data/ffoo_api/functions.stdout.oracle
  28. 0
    0
      test/data/ffoo_api/modules.stdout.oracle
  29. 4
    2
      test/include/simple.sh

test/data/config_cfgrep/both_keys_and_sections.oracle → test/data/config_cfgrep/both_keys_and_sections.stdout.oracle Wyświetl plik


test/data/config_cfgrep/games_with_spaces.oracle → test/data/config_cfgrep/games_with_spaces.stdout.oracle Wyświetl plik


test/data/config_cfgrep/keys_only.oracle → test/data/config_cfgrep/keys_only.stdout.oracle Wyświetl plik


test/data/config_cfgrep/keys_sections_spaces.oracle → test/data/config_cfgrep/keys_sections_spaces.stdout.oracle Wyświetl plik


test/data/config_cfgrep/list_keys.oracle → test/data/config_cfgrep/list_keys.stdout.oracle Wyświetl plik


test/data/config_cfgrep/list_paths.oracle → test/data/config_cfgrep/list_paths.stdout.oracle Wyświetl plik


test/data/config_cfgrep/list_sections.oracle → test/data/config_cfgrep/list_sections.stdout.oracle Wyświetl plik


test/data/config_cfgrep/merge_first.oracle → test/data/config_cfgrep/merge_first.stdout.oracle Wyświetl plik


test/data/config_cfgrep/merge_first_no1.oracle → test/data/config_cfgrep/merge_first_no1.stdout.oracle Wyświetl plik


test/data/config_cfgrep/merge_first_no2.oracle → test/data/config_cfgrep/merge_first_no2.stdout.oracle Wyświetl plik


test/data/config_cfgrep/merge_first_no3.oracle → test/data/config_cfgrep/merge_first_no3.stdout.oracle Wyświetl plik


test/data/config_cfgrep/merge_first_none.oracle → test/data/config_cfgrep/merge_first_none.stdout.oracle Wyświetl plik


test/data/config_cfgrep/merge_first_strict.oracle → test/data/config_cfgrep/merge_first_strict.stdout.oracle Wyświetl plik


test/data/config_cfgrep/merge_join.oracle → test/data/config_cfgrep/merge_join.stdout.oracle Wyświetl plik


test/data/config_cfgrep/merge_join_no1.oracle → test/data/config_cfgrep/merge_join_no1.stdout.oracle Wyświetl plik


test/data/config_cfgrep/merge_join_no2.oracle → test/data/config_cfgrep/merge_join_no2.stdout.oracle Wyświetl plik


test/data/config_cfgrep/merge_join_no3.oracle → test/data/config_cfgrep/merge_join_no3.stdout.oracle Wyświetl plik


test/data/config_cfgrep/merge_join_none.oracle → test/data/config_cfgrep/merge_join_none.stdout.oracle Wyświetl plik


test/data/config_cfgrep/merge_join_strict.oracle → test/data/config_cfgrep/merge_join_strict.stdout.oracle Wyświetl plik


test/data/config_cfgrep/path.oracle → test/data/config_cfgrep/path.stdout.oracle Wyświetl plik


test/data/config_cfgrep/plain.oracle → test/data/config_cfgrep/plain.stdout.oracle Wyświetl plik


test/data/config_cfgrep/plain_strict.oracle → test/data/config_cfgrep/plain_strict.stdout.oracle Wyświetl plik


test/data/config_cfgrep/sections_only.oracle → test/data/config_cfgrep/sections_only.stdout.oracle Wyświetl plik


test/data/config_cfgrep/strict_and_space.oracle → test/data/config_cfgrep/strict_and_space.stdout.oracle Wyświetl plik


test/data/config_cfgrep/strict_and_tab.oracle → test/data/config_cfgrep/strict_and_tab.stdout.oracle Wyświetl plik


test/data/config_cfgrep/tricks_with_strange_naming.oracle → test/data/config_cfgrep/tricks_with_strange_naming.stdout.oracle Wyświetl plik


test/data/ffoo_api/functions.oracle → test/data/ffoo_api/functions.stdout.oracle Wyświetl plik


test/data/ffoo_api/modules.oracle → test/data/ffoo_api/modules.stdout.oracle Wyświetl plik


+ 4
- 2
test/include/simple.sh Wyświetl plik

@@ -58,9 +58,11 @@ tf_do_subtest() {
58 58
         tf_warn "bad header format";
59 59
         return $TF_ES_QUIT
60 60
     fi
61
-    local tcmd="tail -n+$start_at $name | $env $cmd - > $name.result"
61
+    touch $name.stderr.oracle
62
+    local tcmd="tail -n+$start_at $name | $env $cmd - > $name.stdout.result 2> $name.stderr.result"
62 63
     eval "$tcmd"
63
-    diff -u $name.oracle $name.result
64
+    diff -u $name.stdout.oracle $name.stdout.result || return $TF_ES_FAIL
65
+    diff -u $name.stderr.oracle $name.stderr.result || return $TF_ES_FAIL
64 66
 }
65 67
 
66 68
 tf_do_subtests() {