From patchwork Fri Oct 18 20:52:53 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Ryan S. Arnold" X-Patchwork-Id: 21183 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-pd0-f197.google.com (mail-pd0-f197.google.com [209.85.192.197]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id B4BCB202E6 for ; Fri, 18 Oct 2013 20:53:47 +0000 (UTC) Received: by mail-pd0-f197.google.com with SMTP id w10sf6973076pde.4 for ; Fri, 18 Oct 2013 13:53:47 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=mime-version:x-gm-message-state:delivered-to:from:to:cc:subject :date:message-id:in-reply-to:references:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :list-post:list-help:list-archive:list-unsubscribe; bh=GwV8/PLTzkwOo92O/E73CR5LKbqMajZ4tR0hStl7vrU=; b=jCDo8cZYlVxB3YWQo+v7yhReuv6t+bj1TyXx/qpkSMI0jAc0+kZVFAxW407mGXcCcz HKgw7mmFDxVArMgwcsQjCx/MzLosGJ4VoQyajkjBulmVadTUS8zN8AYen++PEYH21QK1 uUpPe0SLlcwuuvV4JkKP/c3kJPD9ZSEfEJWVxLoRP/tW0ovkTk/byHberF7uqtHAIhRt i5B/tZQnWzd4If6r5LqMZAor0W+DXO6us6YJYu12WPle+WLCbrrnTe6NwW9e0Z2x4UEG iZ2ZpjZePmSeYt4evyZSlXURV85A1kD/966E8f3wF/rF+uFqoRMLIvGj+fiC48kzsd90 FLDQ== X-Received: by 10.66.117.170 with SMTP id kf10mr1903355pab.35.1382129627076; Fri, 18 Oct 2013 13:53:47 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.4.228 with SMTP id n4ls1445498qen.71.gmail; Fri, 18 Oct 2013 13:53:46 -0700 (PDT) X-Received: by 10.58.55.227 with SMTP id v3mr3455574vep.16.1382129626897; Fri, 18 Oct 2013 13:53:46 -0700 (PDT) Received: from mail-ve0-f171.google.com (mail-ve0-f171.google.com [209.85.128.171]) by mx.google.com with ESMTPS id fb5si670225vcb.90.2013.10.18.13.53.46 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 18 Oct 2013 13:53:46 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.128.171 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.128.171; Received: by mail-ve0-f171.google.com with SMTP id c14so2445977vea.30 for ; Fri, 18 Oct 2013 13:53:46 -0700 (PDT) X-Gm-Message-State: ALoCoQkNLydcaBFvW705xHFq1PVZW0GOW4Pr6f4CiEweMOgw8IQu2+dqZ1/hzJn/osgy433qGN2c X-Received: by 10.52.229.234 with SMTP id st10mr178627vdc.34.1382129626493; Fri, 18 Oct 2013 13:53:46 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.220.174.196 with SMTP id u4csp63338vcz; Fri, 18 Oct 2013 13:53:46 -0700 (PDT) X-Received: by 10.43.49.8 with SMTP id uy8mr201360icb.73.1382129625845; Fri, 18 Oct 2013 13:53:45 -0700 (PDT) Received: from mail-ie0-f181.google.com (mail-ie0-f181.google.com [209.85.223.181]) by mx.google.com with ESMTPS id yr7si3343117icb.108.2013.10.18.13.53.45 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 18 Oct 2013 13:53:45 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.223.181 is neither permitted nor denied by best guess record for domain of ryan.arnold@linaro.org) client-ip=209.85.223.181; Received: by mail-ie0-f181.google.com with SMTP id ar20so7273217iec.26 for ; Fri, 18 Oct 2013 13:53:45 -0700 (PDT) X-Received: by 10.50.136.200 with SMTP id qc8mr943516igb.52.1382129624990; Fri, 18 Oct 2013 13:53:44 -0700 (PDT) Received: from badwing.hsd1.mn.comcast.net. (c-71-195-40-9.hsd1.mn.comcast.net. [71.195.40.9]) by mx.google.com with ESMTPSA id cl4sm14877361igc.1.2013.10.18.13.53.43 for (version=TLSv1.2 cipher=AES128-GCM-SHA256 bits=128/128); Fri, 18 Oct 2013 13:53:44 -0700 (PDT) From: "Ryan S. Arnold" To: Rob Savoye Cc: patches@linaro.org, "Ryan S. Arnold" Subject: [PATCH][Cbuildb2/get_source 11/17] New variable ${sources_conf} to replace hardcoded config/sources.conf. Date: Fri, 18 Oct 2013 15:52:53 -0500 Message-Id: <1382129579-5777-12-git-send-email-ryan.arnold@linaro.org> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1382129579-5777-1-git-send-email-ryan.arnold@linaro.org> References: <1382129579-5777-1-git-send-email-ryan.arnold@linaro.org> X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: ryan.arnold@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.128.171 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Precedence: list Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , From: "Ryan S. Arnold" This is necessary so that the testsuite can use it's own version that doesn't change, so we can cover all bases. --- configure | 4 ++++ configure.ac | 3 +++ host.conf.in | 4 +++- lib/common.sh | 4 ++-- testsuite/test.sh | 10 ++++++++-- testsuite/test_sources.conf | 43 +++++++++++++++++++++++++++++++++++++++++++ 6 files changed, 63 insertions(+), 5 deletions(-) create mode 100644 testsuite/test_sources.conf diff --git a/configure b/configure index 2c8d95c..8173896 100755 --- a/configure +++ b/configure @@ -604,6 +604,7 @@ REMOTE_SNAPSHOTS LOCAL_BUILDS LOCAL_SNAPSHOTS SYSROOTS +SOURCES_CONF CBUILD_TOP BUILDDATE AUTOGEN @@ -3743,6 +3744,9 @@ $as_echo "$as_me: WARNING: ${CBUILD_TOP} does not exist so creating directory!" mkdir -p ${CBUILD_TOP} fi +SOURCES_CONF="${srcdir}/config/sources.conf" + + # Check whether --with-sysroot was given. if test "${with_sysroot+set}" = set; then : diff --git a/configure.ac b/configure.ac index 90a8151..d973031 100644 --- a/configure.ac +++ b/configure.ac @@ -139,6 +139,9 @@ if test ! -d ${CBUILD_TOP}; then mkdir -p ${CBUILD_TOP} fi +SOURCES_CONF="${srcdir}/config/sources.conf" +AC_SUBST(SOURCES_CONF) + dnl The top of the cbuild tree AC_ARG_WITH(sysroot, AC_HELP_STRING([--with-sysroot], []), diff --git a/host.conf.in b/host.conf.in index 55f89e5..26f42a2 100644 --- a/host.conf.in +++ b/host.conf.in @@ -10,6 +10,8 @@ local_snapshots=@LOCAL_SNAPSHOTS@ remote_snapshots=@REMOTE_SNAPSHOTS@ cbuild_top=@CBUILD_TOP@ +sources_conf=@SOURCES_CONF@ + # This is where the components we build go, ie... make install local_builds=@LOCAL_BUILDS@ @@ -31,4 +33,4 @@ wget_bin=@WGET@ scp_bin=@SCP@ rsync_bin=@RSYNC@ -bash_shell=@BASH@ \ No newline at end of file +bash_shell=@BASH@ diff --git a/lib/common.sh b/lib/common.sh index ff07d62..f681d28 100644 --- a/lib/common.sh +++ b/lib/common.sh @@ -103,7 +103,7 @@ get_URL() { # trace "$*" - local srcs="${topdir}/config/sources.conf" + local srcs="${sources_conf}" local node="`echo $1 | cut -d '/' -f 1`" local branch="`echo $1 | cut -d '/' -f 2 | cut -d '@' -f 1`" if test x"${branch}" = x"${node}"; then @@ -140,7 +140,7 @@ list_URL() { # trace "$*" - local srcs="${topdir}/config/sources.conf" + local srcs="${sources_conf}" if test -e ${srcs}; then notice "Supported source repositories for $1 are:" # sed -e 's:\t.*::' -e 's: .*::' -e 's:^:\t:' ${srcs} | grep $1 diff --git a/testsuite/test.sh b/testsuite/test.sh index 9121f92..f8189e7 100755 --- a/testsuite/test.sh +++ b/testsuite/test.sh @@ -17,7 +17,9 @@ else warning "no host.conf file!" remote_snapshots=http://cbuild.validation.linaro.org/snapshots wget_bin=/usr/bin/wget + sources_conf=${cbuild}testsuite/test_sources.conf fi +echo "Testsuite using ${sources_conf}" # Use wget -q in the testsuite wget_quiet=yes @@ -307,6 +309,10 @@ fi # dryrun=no echo "============= get_source() tests ================" +# TODO Test ${sources_conf} for ${in} for relevant tests. +# Mark tests as untested if the expected match isn't in sources_conf. +# This might be due to running testsuite in a builddir rather than a +# source dir. # Test get_source with a variety of inputs in="asdfasdf" @@ -430,9 +436,9 @@ fi in="gcc-4.6" out="`get_source ${in} 2>/dev/null`" if test x"${out}" = x"svn://gcc.gnu.org/svn/gcc/branches/gcc-4_6-branch"; then - pass "get_source: tag matching an svn repo in sources.conf" + pass "get_source: tag matching an svn repo in ${sources_conf}" else - fail "get_source: tag matching an svn repo in sources.conf" + fail "get_source: tag matching an svn repo in ${sources_conf}" fixme "get_source returned ${out}" fi diff --git a/testsuite/test_sources.conf b/testsuite/test_sources.conf new file mode 100644 index 0000000..5bde540 --- /dev/null +++ b/testsuite/test_sources.conf @@ -0,0 +1,43 @@ +# +# This is a table of URLs for checking out development sources. +# NOTE: use spaces instead of TABs +# + +# GCC +gcc-4.7 svn://gcc.gnu.org/svn/gcc/branches/gcc-4_7-branch +gcc-git git://git.linaro.org/toolchain/gcc.git +gcc-linaro-4.8 git://git.linaro.org/toolchain/gcc.git/linaro-4.8-branch +gcc-linaro-4.7 git://git.linaro.org/toolchain/gcc.git/linaro-4.7-branch +#gcc-linaro-4.7 lp:gcc-linaro/4.7 +gcc-linaro-4.6 lp:gcc-linaro/4.6 +gdb-linaro-7.6 lp:gdb-linaro/7.6 +gdb-linaro-7.5 lp:gdb-linaro/7.5 +clang http://llvm.org/svn/llvm-project/cfe/trunk +cfe http://llvm.org/svn/llvm-project/cfe/trunk + +# Binutils +binutils.git git://git.linaro.org/toolchain/binutils.git +gdb git://git.linaro.org/toolchain/gdb.git + +# Libraries +llvm http://llvm.org/svn/llvm-project/llvm/trunk +eglibc.git git://git.linaro.org/toolchain/eglibc.git +glibc.git git://git.linaro.org/toolchain/glibc.git +newlib.git git://git.linaro.org/toolchain/newlib.git +libgloss.git git://git.linaro.org/toolchain/newlib.git +cortex-strings lp:cortex-strings +libav git://git.libav.org/libav.git +libffi git://github.com/atgreen/libffi.git + +crosstool-ng-linaro lp:~linaro-toolchain-dev/crosstool-ng/linaro + +boot-wrapper git://git.linaro.org/arm/models/boot-wrapper.git + +bitbake git://git.openembedded.org/bitbake +llvm-test-suite http://llvm.org/svn/llvm-project/test-suite/trunk + +meta-linaro git://git.linaro.org/openembedded/meta-linaro.git +openembedded-core git://git.openembedded.org/openembedded-core +valgrind svn://svn.valgrind.org/valgrind/trunk +qemu git://git.qemu.org/qemu.git +qemu-linaro git://git.linaro.org/qemu/qemu-linaro.git