| author | Brian Utterback <brian.utterback@oracle.com> |
| Thu, 07 Jan 2016 18:40:27 -0800 | |
| changeset 5360 | af56e129673d |
| parent 4747 | 0e43ac303e45 |
| permissions | -rw-r--r-- |
|
4747
0e43ac303e45
21571218 Even more Userland components should have their system-test targets hooked up
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
1 |
Patch to allow us to specify an alternate checkmk script when running tests. |
|
0e43ac303e45
21571218 Even more Userland components should have their system-test targets hooked up
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
2 |
|
|
0e43ac303e45
21571218 Even more Userland components should have their system-test targets hooked up
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
3 |
This patch should be sent upstream. |
|
0e43ac303e45
21571218 Even more Userland components should have their system-test targets hooked up
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
4 |
|
|
0e43ac303e45
21571218 Even more Userland components should have their system-test targets hooked up
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
5 |
--- check-0.9.14/checkmk/test/check_checkmk.orig 2015-08-06 11:03:07.140153543 -0700 |
|
0e43ac303e45
21571218 Even more Userland components should have their system-test targets hooked up
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
6 |
+++ check-0.9.14/checkmk/test/check_checkmk 2015-08-06 11:04:59.521955758 -0700 |
|
0e43ac303e45
21571218 Even more Userland components should have their system-test targets hooked up
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
7 |
@@ -39,7 +39,7 @@ |
|
0e43ac303e45
21571218 Even more Userland components should have their system-test targets hooked up
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
8 |
errfname="$outdir/err" |
|
0e43ac303e45
21571218 Even more Userland components should have their system-test targets hooked up
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
9 |
diffname="$outdir/diff" |
|
0e43ac303e45
21571218 Even more Userland components should have their system-test targets hooked up
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
10 |
errdiffname="$outdir/err-diff" |
|
0e43ac303e45
21571218 Even more Userland components should have their system-test targets hooked up
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
11 |
- CHECKMK="$checkmkdir/checkmk" |
|
0e43ac303e45
21571218 Even more Userland components should have their system-test targets hooked up
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
12 |
+ CHECKMK="${CHECKMK_SCRIPT:-$checkmkdir/checkmk}"
|
|
0e43ac303e45
21571218 Even more Userland components should have their system-test targets hooked up
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
13 |
checkmk_cmd='"$CHECKMK" "$infname" > "$outfname" 2>"$errfname"' |
|
0e43ac303e45
21571218 Even more Userland components should have their system-test targets hooked up
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
14 |
|
|
0e43ac303e45
21571218 Even more Userland components should have their system-test targets hooked up
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
15 |
rm -f "$outfname" "$errfname" "$diffname" "$errdiffname" |