author | Rich Burridge <rich.burridge@oracle.com> |
Fri, 07 Aug 2015 14:59:43 -0700 | |
changeset 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 conflict binary 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 |
--- conflict-20140723/run_test.sh.orig 2015-08-04 07:48:20.892345554 -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 |
+++ conflict-20140723/run_test.sh 2015-08-04 07:49:21.230009358 -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 |
@@ -2,7 +2,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 |
# $Id: run_test.sh,v 6.3 2004/06/20 23:13:23 tom Exp $ |
0e43ac303e45
21571218 Even more Userland components should have their system-test targets hooked up
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
9 |
# Run a test to show that CONFLICT is working |
0e43ac303e45
21571218 Even more Userland components should have their system-test targets hooked up
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
10 |
BIN=`pwd` |
0e43ac303e45
21571218 Even more Userland components should have their system-test targets hooked up
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
11 |
-PROG=$BIN/conflict |
0e43ac303e45
21571218 Even more Userland components should have their system-test targets hooked up
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
12 |
+PROG="${CONFLICT_BIN:-$BIN/conflict}" |
0e43ac303e45
21571218 Even more Userland components should have their system-test targets hooked up
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
13 |
PATH=".:$BIN:/bin"; export PATH |
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 |
cat <<eof/ |