Skip to content

Commit f6810d9

Browse files
authored
Removed unused travis config code (etr#188)
1 parent bc700b5 commit f6810d9

File tree

1 file changed

+1
-88
lines changed

1 file changed

+1
-88
lines changed

.travis.yml

Lines changed: 1 addition & 88 deletions
Original file line numberDiff line numberDiff line change
@@ -53,11 +53,7 @@ before_install:
5353
- curl https://s3.amazonaws.com/libhttpserver/libmicrohttpd_releases/libmicrohttpd-0.9.59.tar.gz -o libmicrohttpd-0.9.59.tar.gz
5454
- tar -xzf libmicrohttpd-0.9.59.tar.gz
5555
- cd libmicrohttpd-0.9.59
56-
- if [[ "$ARM_ARCH_DIR" != "" ]]; then
57-
./configure --build `./config.guess` --host $ARM_ARCH_DIR --disable-examples;
58-
else
59-
if [ "$TRAVIS_OS_NAME" != "windows" ]; then $buildshell ./configure --disable-examples; else $buildshell ./configure --disable-examples --enable-poll=no; fi;
60-
fi
56+
- if [ "$TRAVIS_OS_NAME" != "windows" ]; then $buildshell ./configure --disable-examples; else $buildshell ./configure --disable-examples --enable-poll=no; fi;
6157
- $buildshell make
6258
- if [ "$TRAVIS_OS_NAME" != "windows" ]; then sudo make install; else $buildshell make install; fi
6359
- cd ..
@@ -67,15 +63,6 @@ before_install:
6763
- if [ "$BUILD_TYPE" = "tsan" ]; then export CFLAGS='-fsanitize=thread'; export CXXLAGS='-fsanitize=thread'; export LDFLAGS='-fsanitize=thread'; fi
6864
- if [ "$BUILD_TYPE" = "ubsan" ]; then export export CFLAGS='-fsanitize=undefined'; export CXXLAGS='-fsanitize=undefined'; export LDFLAGS='-fsanitize=undefined'; fi
6965
install:
70-
- if [[ "$CROSS_COMPILE" == 1 ]] ; then
71-
if [[ "$ARM_ARCH_DIR" == "aarch64-linux-gnu" ]] ; then
72-
mkdir $HOME/linker_bin ;
73-
ln -s /usr/bin/aarch64-linux-gnu-ld $HOME/linker_bin/ld ;
74-
LD=$HOME/linker_bin/ld ;
75-
echo "SETTING GNU LINKER DIR" ;
76-
ls -al $HOME/linker_bin/ld ;
77-
fi
78-
fi
7966
- $buildshell ./bootstrap
8067
- mkdir build
8168
- cd build
@@ -86,39 +73,13 @@ install:
8673
$buildshell ../configure --enable-debug --enable-coverage --disable-shared --disable-fastopen;
8774
elif [ "$DEBUG" = "debug" ]; then
8875
$buildshell ../configure --enable-debug --disable-shared --disable-fastopen;
89-
elif [ "$CROSS_COMPILE" = "1" ] && [ "$ARM_ARCH_DIR" = "aarch64-linux-gnu" ]; then
90-
$buildshell ../configure --disable-fastopen --build `../config.guess` --host aarch64-linux-gnu CC="gcc -B$HOME/linker_bin" CXX="g++ -B$HOME/linker_bin";
91-
elif [ "$CROSS_COMPILE" = "1" ] && [ "$ARM_ARCH_DIR" = "arm-linux-gnueabi" ]; then
92-
$buildshell ../configure --disable-fastopen --build `../config.guess` --host arm-linux-gnueabi;
9376
elif [ "$VALGRIND" = "valgrind" ]; then
9477
$buildshell ../configure --enable-debug --disable-fastopen --disable-valgrind-helgrind --disable-valgrind-drd --disable-valgrind-sgcheck;
9578
else
9679
$buildshell ../configure --disable-fastopen;
9780
fi
98-
- if [ "$CROSS_COMPILE" = "1" ] && [ "$ARM_ARCH_DIR" = "aarch64-linux-gnu" ]; then sed -i 's+/usr/bin/ld+$HOME/linker_bin/ld+g' libtool; fi
99-
- if [ "$CROSS_COMPILE" = "1" ] && [ "$ARM_ARCH_DIR" = "aarch64-linux-gnu" ]; then sed -i 's+/usr/bin/ld+$HOME/linker_bin/ld+g' Makefile; fi
10081
- $buildshell make
10182
script:
102-
- if [[ "$CROSS_COMPILE" == 1 ]]; then
103-
cd test ;
104-
if [[ "$ARM_ARCH_DIR" == "aarch64-linux-gnu" ]]; then
105-
file ./.libs/basic;
106-
file ./.libs/http_utils;
107-
file ./.libs/threaded;
108-
109-
qemu-aarch64 -L /usr/aarch64-linux-gnu/ ./.libs/basic ;
110-
qemu-aarch64 -L /usr/aarch64-linux-gnu/ ./.libs/http_utils ;
111-
qemu-aarch64 -L /usr/aarch64-linux-gnu/ ./.libs/threaded ;
112-
else
113-
file ./.libs/basic;
114-
file ./.libs/http_utils;
115-
file ./.libs/threaded;
116-
117-
qemu-arm -L /usr/arm-linux-gnueabi/ ./.libs/basic ;
118-
qemu-arm -L /usr/arm-linux-gnueabi/ ./.libs/http_utils ;
119-
qemu-arm -L /usr/arm-linux-gnueabi/ ./.libs/threaded ;
120-
fi
121-
fi
12283
- $buildshell make check
12384
- $buildshell cat test/test-suite.log
12485
- if [ "$VALGRIND" = "valgrind" ]; then make check-valgrind; fi;
@@ -284,22 +245,6 @@ matrix:
284245
- apache2-utils
285246
env:
286247
- MATRIX_EVAL="CC=gcc-7 && CXX=g++-7 && PERFORMANCE=threads"
287-
#- os: osx
288-
# osx_image: xcode8
289-
# env:
290-
# - MATRIX_EVAL="CC=gcc-4.9 && CXX=g++-4.9"
291-
#- os: osx
292-
# osx_image: xcode8
293-
# env:
294-
# - MATRIX_EVAL="brew install gcc5 && CC=gcc-5 && CXX=g++-5"
295-
#- os: osx
296-
# osx_image: xcode8
297-
# env:
298-
# - MATRIX_EVAL="brew install gcc6 && CC=gcc-6 && CXX=g++-6"
299-
#- os: osx
300-
# osx_image: xcode8
301-
# env:
302-
# - MATRIX_EVAL="brew install gcc && CC=gcc-7 && CXX=g++-7"
303248
# works on Precise and Trusty
304249
- os: linux
305250
addons:
@@ -398,35 +343,3 @@ matrix:
398343
- clang-9
399344
env:
400345
- MATRIX_EVAL="CC=clang-9 && CXX=clang++-9"
401-
- os: linux
402-
compiler: clang
403-
addons:
404-
apt:
405-
sources:
406-
- ubuntu-toolchain-r-test
407-
packages:
408-
- clang-3.9
409-
- g++-arm-linux-gnueabi
410-
- g++-multilib
411-
- gcc-multilib
412-
- qemu
413-
- qemu-system-arm
414-
env: MATRIX_EVAL="CROSS_COMPILE=1 && ARM_ARCH_DIR=arm-linux-gnueabi && CC=arm-linux-gnueabi-gcc"
415-
- os: linux
416-
compiler: clang
417-
addons:
418-
apt:
419-
sources:
420-
- ubuntu-toolchain-r-test
421-
packages:
422-
- clang-3.9
423-
- g++-4.8-aarch64-linux-gnu
424-
- gcc-4.8-aarch64-linux-gnu
425-
- g++-4.8-multilib
426-
- gcc-4.8-multilib
427-
- qemu
428-
- qemu-system-arm
429-
env: MATRIX_EVAL="CROSS_COMPILE=1 && ARM_LD_PATH=$HOME/linker_bin && ARM_ARCH_DIR=aarch64-linux-gnu"
430-
allow_failures:
431-
- env: MATRIX_EVAL="CROSS_COMPILE=1 && ARM_ARCH_DIR=arm-linux-gnueabi && CC=arm-linux-gnueabi-gcc"
432-
- env: MATRIX_EVAL="CROSS_COMPILE=1 && ARM_LD_PATH=$HOME/linker_bin && ARM_ARCH_DIR=aarch64-linux-gnu"

0 commit comments

Comments
 (0)