From a95e11401ab770ca8d7a13ac135ac59f0e8e188e Mon Sep 17 00:00:00 2001 From: Ciro Santilli Date: Thu, 2 Nov 2017 15:14:37 +0000 Subject: [PATCH] travis 5 --- .travis.yml | 10 ++++++++-- configure | 8 +++----- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/.travis.yml b/.travis.yml index 3fe099b..74f026c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,11 @@ language: cpp -install: ./configure -t +sudo: required -script: ./run -e 'init=/poweroff.out' -n +install: | + cd "$TRAVIS_BUILD_DIR" + ./configure -t + +script: | + cd "$TRAVIS_BUILD_DIR" + ./run -e 'init=/poweroff.out' -n diff --git a/configure b/configure index d42a377..4076626 100755 --- a/configure +++ b/configure @@ -1,20 +1,18 @@ #!/usr/bin/env bash -s='sudo' y='' while getopts t OPT; do case "$OPT" in t) - s='' y='-y' ;; esac done shift $(($OPTIND - 1)) -$s apt-get update $y +sudo apt-get update $y # Building SDL for QEMU in Buildroot was rejected upstream because it adds many dependencies: # https://patchwork.ozlabs.org/patch/770684/ # We are just using the host SDL for now, if it causes too much problems we might remove it. # libsdl2-dev needs to be installed separatedly from sudo apt-get build-dep qemu # because Ubuntu 16.04's QEMU uses SDL 1. -$s apt-get install $y build-essential libsdl2-dev -$s apt-get build-dep $y qemu +sudo apt-get install $y build-essential libsdl2-dev +sudo apt-get build-dep $y qemu