浏览代码

Upgrade TFKit to v0.0.12

Alois Mahdal 7 年前
父节点
当前提交
01e3496e7b
共有 2 个文件被更改,包括 34 次插入34 次删除
  1. 0
    25
      utils/tfkit/include/common.sh
  2. 34
    9
      utils/tfkit/runtests

+ 0
- 25
utils/tfkit/include/common.sh 查看文件

@@ -7,31 +7,6 @@ TF_ES_BAILOUT=2
7 7
 TF_ES_ERROR=3
8 8
 TF_ES_PANIC=4
9 9
 
10
-#
11
-# Option to turn on/off verbosity
12
-#
13
-TF_VERBOSE=${TF_VERBOSE:-true}
14
-
15
-#
16
-# Option to turn on/off debug mode
17
-#
18
-TF_DEBUG=${TF_DEBUG:-false}
19
-
20
-#
21
-# Regex to filter test names to run
22
-#
23
-TF_FILTER_TEST="${TF_FILTER_TEST:-.*}"
24
-
25
-#
26
-# Regex to filter subtest names to run
27
-#
28
-TF_FILTER_SUBTEST="${TF_FILTER_SUBTEST:-.*}"
29
-
30
-#
31
-# Enable color?
32
-#
33
-TF_COLOR=${TF_COLOR:-true}
34
-
35 10
 #
36 11
 # Color definition variables
37 12
 #

+ 34
- 9
utils/tfkit/runtests 查看文件

@@ -2,7 +2,7 @@
2 2
 # tfkit - Shellfu's movable test framework
3 3
 # See LICENSE file for copyright and license details.
4 4
 
5
-TF_VERSION="0.0.11"
5
+TF_VERSION="0.0.12"
6 6
 
7 7
 die() {
8 8
     echo "$@" && exit 9
@@ -20,28 +20,53 @@ version() {
20 20
 
21 21
 LC_ALL=C
22 22
 
23
+#
24
+# Artifact directory path
25
+#
26
+TF_ARTIFACTS="${TF_ARTIFACTS:-artifacts}"
27
+
28
+#
29
+# Artifact collection mode
30
+#
31
+# 'always' to always collect, 'never` to never collect and 'auto'
32
+# to collect only on failed tests.
33
+#
34
+TF_COLLECT="${TF_COLLECT:-auto}"
35
+
36
+#
37
+# Enable color?
38
+#
39
+TF_COLOR=${TF_COLOR:-true}
40
+
41
+#
42
+# Turn on debug mode?
43
+#
44
+TF_DEBUG="${TF_DEBUG:-false}"
45
+
23 46
 #
24 47
 # Location of own directory
25 48
 #
26 49
 TF_DIR=${TF_DIR:-$(dirname "$0")}
27 50
 
28 51
 #
29
-# Location of test suite
52
+# Regex (BRE) to filter subtests based on name
30 53
 #
31
-TF_SUITE="${TF_SUITE:-tests}"
54
+TF_FILTER_SUBTEST=${TF_FILTER_SUBTEST:-}
32 55
 
33 56
 #
34
-# Artifact directory path
57
+# Regex (BRE) to filter tests based on name
35 58
 #
36
-TF_ARTIFACTS="${TF_ARTIFACTS:-artifacts}"
59
+TF_FILTER_TEST=${TF_FILTER_TEST:-}
37 60
 
38 61
 #
39
-# Artifact collection mode
62
+# Location of test suite
40 63
 #
41
-# 'always' to always collect, 'never` to never collect and 'auto'
42
-# to collect only on failed tests.
64
+TF_SUITE="${TF_SUITE:-tests}"
65
+
43 66
 #
44
-TF_COLLECT="${TF_COLLECT:-auto}"
67
+# Turn on verbosity?
68
+#
69
+TF_VERBOSE=${TF_VERBOSE:-true}
45 70
 
46 71
 while true; do case "$1" in
47 72
     -c|--collect)           TF_COLLECT=always;          shift ;;