diff options
| author |  Jan Tattermusch <jtattermusch@google.com> | 2015-06-03 14:02:07 -0700 |
|---|---|---|
| committer | Jan Tattermusch <jtattermusch@google.com> | 2015-06-03 14:02:07 -0700 |
| commit | 8fa8c04ec4af5f155558f824a9a005087bba7f7d (patch) | |
| tree | 587e08f9c5d2c41ae4579da872222d7534c09ffb | |
| parent | f44a2b8c0f71d20fa88e4ddc1e267032ecc673ea (diff) | |
fix CRLF line ending problem with run_jenkins.sh
| -rwxr-xr-x | tools/jenkins/run_jenkins.sh | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/tools/jenkins/run_jenkins.sh b/tools/jenkins/run_jenkins.sh index 0b66e27bbb..417cf92565 100755 --- a/tools/jenkins/run_jenkins.sh +++ b/tools/jenkins/run_jenkins.sh @@ -27,11 +27,15 @@ # THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - +# # This script is invoked by Jenkins and triggers a test run based on # env variable settings. - -set -ex +# +# To prevent cygwin bash complaining about empty lines ending with \r +# we set the igncr option. The option doesn't exist on Linux, so we fallback +# to just 'set -ex' there. +# NOTE: No empty lines should appear in this file before igncr is set! +set -ex -o igncr || set -ex if [ "$platform" == "linux" ] then |