diff options
| author | Maxime Dénès | 2017-05-28 12:55:18 +0200 |
|---|---|---|
| committer | Maxime Dénès | 2017-05-28 12:55:18 +0200 |
| commit | 7816815c01c6338dbd3447bad6ff2fcca415e139 (patch) | |
| tree | 7fd7b213dc5595801e524153a1fdcf62640176f9 | |
| parent | 834942a0c30c1e770b167846873bede9254ebdcc (diff) | |
| parent | 95ea00ce688ba8c5e257a4a9bd2ea0eca4ed3748 (diff) | |
Merge PR#684: Trunk+fix coq makefile test suite on nixos
| -rwxr-xr-x | test-suite/coq-makefile/arg/run.sh | 2 | ||||
| -rwxr-xr-x | test-suite/coq-makefile/compat-subdirs/run.sh | 2 | ||||
| -rwxr-xr-x | test-suite/coq-makefile/coqdoc1/run.sh | 2 | ||||
| -rwxr-xr-x | test-suite/coq-makefile/coqdoc2/run.sh | 2 | ||||
| -rwxr-xr-x | test-suite/coq-makefile/extend-subdirs/run.sh | 2 | ||||
| -rwxr-xr-x | test-suite/coq-makefile/latex1/run.sh | 2 | ||||
| -rwxr-xr-x | test-suite/coq-makefile/merlin1/run.sh | 2 | ||||
| -rwxr-xr-x | test-suite/coq-makefile/mlpack1/run.sh | 2 | ||||
| -rwxr-xr-x | test-suite/coq-makefile/mlpack2/run.sh | 2 | ||||
| -rwxr-xr-x | test-suite/coq-makefile/multiroot/run.sh | 2 | ||||
| -rwxr-xr-x | test-suite/coq-makefile/native1/run.sh | 2 | ||||
| -rwxr-xr-x | test-suite/coq-makefile/only/run.sh | 2 | ||||
| -rwxr-xr-x | test-suite/coq-makefile/plugin1/run.sh | 2 | ||||
| -rwxr-xr-x | test-suite/coq-makefile/plugin2/run.sh | 2 | ||||
| -rwxr-xr-x | test-suite/coq-makefile/plugin3/run.sh | 2 | ||||
| -rwxr-xr-x[-rw-r--r--] | test-suite/coq-makefile/template/init.sh | 0 | ||||
| -rwxr-xr-x | test-suite/coq-makefile/uninstall1/run.sh | 2 | ||||
| -rwxr-xr-x | test-suite/coq-makefile/uninstall2/run.sh | 2 | ||||
| -rwxr-xr-x | test-suite/coq-makefile/validate1/run.sh | 2 |
19 files changed, 18 insertions, 18 deletions
diff --git a/test-suite/coq-makefile/arg/run.sh b/test-suite/coq-makefile/arg/run.sh index 28b9bcb969..e98da17c78 100755 --- a/test-suite/coq-makefile/arg/run.sh +++ b/test-suite/coq-makefile/arg/run.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/usr/bin/env bash #set -x set -e diff --git a/test-suite/coq-makefile/compat-subdirs/run.sh b/test-suite/coq-makefile/compat-subdirs/run.sh index ccb348c6fa..28d9878f9b 100755 --- a/test-suite/coq-makefile/compat-subdirs/run.sh +++ b/test-suite/coq-makefile/compat-subdirs/run.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/usr/bin/env bash #set -x set -e diff --git a/test-suite/coq-makefile/coqdoc1/run.sh b/test-suite/coq-makefile/coqdoc1/run.sh index e071f1db7a..218d41184d 100755 --- a/test-suite/coq-makefile/coqdoc1/run.sh +++ b/test-suite/coq-makefile/coqdoc1/run.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash #set -x set -e diff --git a/test-suite/coq-makefile/coqdoc2/run.sh b/test-suite/coq-makefile/coqdoc2/run.sh index e071f1db7a..218d41184d 100755 --- a/test-suite/coq-makefile/coqdoc2/run.sh +++ b/test-suite/coq-makefile/coqdoc2/run.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash #set -x set -e diff --git a/test-suite/coq-makefile/extend-subdirs/run.sh b/test-suite/coq-makefile/extend-subdirs/run.sh index db11601132..ea5792a937 100755 --- a/test-suite/coq-makefile/extend-subdirs/run.sh +++ b/test-suite/coq-makefile/extend-subdirs/run.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/usr/bin/env bash #set -x set -e diff --git a/test-suite/coq-makefile/latex1/run.sh b/test-suite/coq-makefile/latex1/run.sh index 45f2269113..214a9d5b28 100755 --- a/test-suite/coq-makefile/latex1/run.sh +++ b/test-suite/coq-makefile/latex1/run.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash #set -x set -e diff --git a/test-suite/coq-makefile/merlin1/run.sh b/test-suite/coq-makefile/merlin1/run.sh index 9b89e5b6e9..752c0c2cea 100755 --- a/test-suite/coq-makefile/merlin1/run.sh +++ b/test-suite/coq-makefile/merlin1/run.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/usr/bin/env bash #set -x set -e diff --git a/test-suite/coq-makefile/mlpack1/run.sh b/test-suite/coq-makefile/mlpack1/run.sh index 418a2fb775..101c096eb6 100755 --- a/test-suite/coq-makefile/mlpack1/run.sh +++ b/test-suite/coq-makefile/mlpack1/run.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/usr/bin/env bash #set -x set -e diff --git a/test-suite/coq-makefile/mlpack2/run.sh b/test-suite/coq-makefile/mlpack2/run.sh index 418a2fb775..101c096eb6 100755 --- a/test-suite/coq-makefile/mlpack2/run.sh +++ b/test-suite/coq-makefile/mlpack2/run.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/usr/bin/env bash #set -x set -e diff --git a/test-suite/coq-makefile/multiroot/run.sh b/test-suite/coq-makefile/multiroot/run.sh index a24a8a3cf7..1237a4e069 100755 --- a/test-suite/coq-makefile/multiroot/run.sh +++ b/test-suite/coq-makefile/multiroot/run.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash #set -x set -e diff --git a/test-suite/coq-makefile/native1/run.sh b/test-suite/coq-makefile/native1/run.sh index 097bd6398a..db2e9036bf 100755 --- a/test-suite/coq-makefile/native1/run.sh +++ b/test-suite/coq-makefile/native1/run.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/usr/bin/env bash #set -x set -e diff --git a/test-suite/coq-makefile/only/run.sh b/test-suite/coq-makefile/only/run.sh index 4b471bcb80..2ea3deffb7 100755 --- a/test-suite/coq-makefile/only/run.sh +++ b/test-suite/coq-makefile/only/run.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/usr/bin/env bash #set -x set -e diff --git a/test-suite/coq-makefile/plugin1/run.sh b/test-suite/coq-makefile/plugin1/run.sh index 684e0ece82..8094ae20c1 100755 --- a/test-suite/coq-makefile/plugin1/run.sh +++ b/test-suite/coq-makefile/plugin1/run.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/usr/bin/env bash #set -x set -e diff --git a/test-suite/coq-makefile/plugin2/run.sh b/test-suite/coq-makefile/plugin2/run.sh index 684e0ece82..8094ae20c1 100755 --- a/test-suite/coq-makefile/plugin2/run.sh +++ b/test-suite/coq-makefile/plugin2/run.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/usr/bin/env bash #set -x set -e diff --git a/test-suite/coq-makefile/plugin3/run.sh b/test-suite/coq-makefile/plugin3/run.sh index 684e0ece82..8094ae20c1 100755 --- a/test-suite/coq-makefile/plugin3/run.sh +++ b/test-suite/coq-makefile/plugin3/run.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/usr/bin/env bash #set -x set -e diff --git a/test-suite/coq-makefile/template/init.sh b/test-suite/coq-makefile/template/init.sh index bfd2c1b959..bfd2c1b959 100644..100755 --- a/test-suite/coq-makefile/template/init.sh +++ b/test-suite/coq-makefile/template/init.sh diff --git a/test-suite/coq-makefile/uninstall1/run.sh b/test-suite/coq-makefile/uninstall1/run.sh index d241762791..ced59b7b0d 100755 --- a/test-suite/coq-makefile/uninstall1/run.sh +++ b/test-suite/coq-makefile/uninstall1/run.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash #set -x set -e diff --git a/test-suite/coq-makefile/uninstall2/run.sh b/test-suite/coq-makefile/uninstall2/run.sh index d241762791..ced59b7b0d 100755 --- a/test-suite/coq-makefile/uninstall2/run.sh +++ b/test-suite/coq-makefile/uninstall2/run.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash #set -x set -e diff --git a/test-suite/coq-makefile/validate1/run.sh b/test-suite/coq-makefile/validate1/run.sh index 61025021d0..aaa4194b38 100755 --- a/test-suite/coq-makefile/validate1/run.sh +++ b/test-suite/coq-makefile/validate1/run.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/usr/bin/env bash #set -x set -e |
