瀏覽代碼

Update TFKit to v0.0.6

Alois Mahdal 9 年之前
父節點
當前提交
ba48306017
共有 2 個文件被更改,包括 6 次插入3 次删除
  1. 5
    2
      utils/tfkit/include/tools.sh
  2. 1
    1
      utils/tfkit/runtests

+ 5
- 2
utils/tfkit/include/tools.sh 查看文件

28
     local o_es="0"              # oralce: exit status
28
     local o_es="0"              # oralce: exit status
29
     local r_out r_err r_es      # result: ^ ^ ^ those 3
29
     local r_out r_err r_es      # result: ^ ^ ^ those 3
30
 
30
 
31
+    local diff=diff
32
+    type colordiff >/dev/null 2>/dev/null && diff=colordiff
33
+
31
     # get args
34
     # get args
32
     #
35
     #
33
     local orig_args="$0 $*"
36
     local orig_args="$0 $*"
77
     # eval/report/exit
80
     # eval/report/exit
78
     #
81
     #
79
     test $r_es = $o_es || { tf_warn "bad exit status: $r_es (need $o_es)" ; t_es=$TF_ES_FAIL; }
82
     test $r_es = $o_es || { tf_warn "bad exit status: $r_es (need $o_es)" ; t_es=$TF_ES_FAIL; }
80
-    diff -u "$o_err" "$r_err" || t_es=$TF_ES_FAIL
81
-    diff -u "$o_out" "$r_out" || t_es=$TF_ES_FAIL
83
+    $diff -u "$o_err" "$r_err" || t_es=$TF_ES_FAIL
84
+    $diff -u "$o_out" "$r_out" || t_es=$TF_ES_FAIL
82
     return $t_es
85
     return $t_es
83
 }
86
 }

+ 1
- 1
utils/tfkit/runtests 查看文件

2
 # ffoo test framework
2
 # ffoo test framework
3
 # See LICENSE file for copyright and license details.
3
 # See LICENSE file for copyright and license details.
4
 
4
 
5
-TF_VERSION="0.0.5"
5
+TF_VERSION="0.0.6"
6
 
6
 
7
 die() {
7
 die() {
8
     echo "$@" && exit 9
8
     echo "$@" && exit 9