| author | Vladimir Marek <Vladimir.Marek@oracle.com> |
| Thu, 26 Jan 2017 12:24:45 +0100 | |
| branch | s11u3-sru |
| changeset 7627 | 4758b76d5ad5 |
| permissions | -rw-r--r-- |
|
7627
4758b76d5ad5
25123965 Update bash to version 4.4
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
1 |
# Our build system exports SHELLOPTS which makes testing fail We could have set |
|
4758b76d5ad5
25123965 Update bash to version 4.4
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
2 |
# "unexport SHELLOPTS" in our Makefile, but maybe this will be accepted by |
|
4758b76d5ad5
25123965 Update bash to version 4.4
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
3 |
# community? |
|
4758b76d5ad5
25123965 Update bash to version 4.4
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
4 |
# |
|
4758b76d5ad5
25123965 Update bash to version 4.4
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
5 |
# Reported to [email protected] |
|
4758b76d5ad5
25123965 Update bash to version 4.4
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
6 |
|
|
4758b76d5ad5
25123965 Update bash to version 4.4
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
7 |
--- tests/run-all 2016-11-28 00:46:51.812583704 -0800 |
|
4758b76d5ad5
25123965 Update bash to version 4.4
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
8 |
+++ tests/run-all 2016-11-28 00:45:20.302845042 -0800 |
|
4758b76d5ad5
25123965 Update bash to version 4.4
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
9 |
@@ -17,7 +17,7 @@ export PATH |
|
4758b76d5ad5
25123965 Update bash to version 4.4
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
10 |
# unset BASH_ENV only if it is set |
|
4758b76d5ad5
25123965 Update bash to version 4.4
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
11 |
[ "${BASH_ENV+set}" = "set" ] && unset BASH_ENV
|
|
4758b76d5ad5
25123965 Update bash to version 4.4
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
12 |
# ditto for SHELLOPTS |
|
4758b76d5ad5
25123965 Update bash to version 4.4
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
13 |
-#[ "${SHELLOPTS+set}" = "set" ] && unset SHELLOPTS
|
|
4758b76d5ad5
25123965 Update bash to version 4.4
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
14 |
+[ "${SHELLOPTS+set}" = "set" ] && unset SHELLOPTS
|
|
4758b76d5ad5
25123965 Update bash to version 4.4
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
15 |
|
|
4758b76d5ad5
25123965 Update bash to version 4.4
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
16 |
: ${THIS_SH:=../bash}
|
|
4758b76d5ad5
25123965 Update bash to version 4.4
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
17 |
export THIS_SH |