verilog: allow spaces in macro arguments

[yosys.git] / .travis / setup.sh

diff --git a/.travis/setup.sh b/.travis/setup.sh
index d689cd2bdf0561ea9892f3710775d6b54c5adf7d..02879b974368a807e86e5b6c35e36367ea8d93cf 100755 (executable)
--- a/.travis/setup.sh
+++ b/.travis/setup.sh
@@ -6,48 +6,15 @@ source .travis/common.sh
 
 ##########################################################################
 
-# Fixing Travis's git clone
-echo
-echo 'Fixing git setup...' && echo -en 'travis_fold:start:before_install.git\\r'
-echo
-git fetch --unshallow && git fetch --tags
-
-# For pull requests, we get more info about the git source.
-if [ z"$TRAVIS_PULL_REQUEST_SLUG" != z ]; then
-       echo "- Fetching from pull request source"
-       git remote add source https://github.com/$TRAVIS_PULL_REQUEST_SLUG.git
-       git fetch source && git fetch --tags
-
-       echo "- Fetching the actual pull request"
-       git fetch origin pull/$TRAVIS_PULL_REQUEST/head:pull-$TRAVIS_PULL_REQUEST-head
-       git fetch origin pull/$TRAVIS_PULL_REQUEST/merge:pull-$TRAVIS_PULL_REQUEST-merge
-
-       git log -n 5 --graph pull-$TRAVIS_PULL_REQUEST-merge
-fi
-
-# For building branches we need to fix the "detached head" state.
-if [ z"$TRAVIS_BRANCH" != z ]; then
-       TRAVIS_COMMIT_ACTUAL=$(git log --pretty=format:'%H' -n 1)
-       echo "- Fixing detached head (current $TRAVIS_COMMIT_ACTUAL -> $TRAVIS_COMMIT)"
-       git remote -v
-       git branch -v
-       if [ x"$(git show-ref -s HEAD)" = x"$TRAVIS_COMMIT" ]; then
-               echo "Checked out at $TRAVIS_COMMIT"
-       else
-               if [ z"$TRAVIS_PULL_REQUEST_SLUG" != z ]; then
-                       git fetch source $TRAVIS_COMMIT || echo "Unable to fetch $TRAVIS_COMMIT from source"
-               fi
-               git fetch origin $TRAVIS_COMMIT || echo "Unable to fetch $TRAVIS_COMMIT from origin"
-       fi
-       git branch -D $TRAVIS_BRANCH || true
-       git checkout $TRAVIS_COMMIT -b $TRAVIS_BRANCH
-       git branch -v
-fi
-
 # Output status information.
-git status
-git describe --tags
-git log -n 5 --graph
+(
+       set +e
+       set -x
+       git status
+       git branch -v
+       git log -n 5 --graph
+       git log --format=oneline -n 20 --graph
+)
 echo
 echo -en 'travis_fold:end:before_install.git\\r'
 echo
@@ -84,7 +51,7 @@ fi
                git clone git://github.com/steveicarus/iverilog.git
                cd iverilog
                autoconf
-               ./configure --prefix=$HOME/.local-bin
+               CC=gcc CXX=g++ ./configure --prefix=$HOME/.local-bin
                make
                make install
                echo