From ec050b2f1a1a1e51692251d3a7687e48c226fff5 Mon Sep 17 00:00:00 2001 From: Boris Kolpackov Date: Thu, 4 Feb 2016 07:14:34 +0200 Subject: Updates during the 0.2.0 release --- test | 51 ++++++++++++++++++++++++++++++++++++++++----------- 1 file changed, 40 insertions(+), 11 deletions(-) (limited to 'test') diff --git a/test b/test index a09710a..73dd613 100755 --- a/test +++ b/test @@ -24,7 +24,6 @@ fi src=build2-$v - # Update the development build. # info "making sure everythings is up to date..." @@ -33,7 +32,9 @@ b build2/ bpkg/ # Test repository with the earliest and latest (development build via # /usr/local links) toolchains. # -for t in etc1/install/0.1.0 /usr/local; do +# etc1/install/0.1.0 +# +for t in /usr/local; do cppget.org/test -t $t -n \ -c cxx \ -c config.cxx.coptions="-W -Wall -Wno-unknown-pragmas" \ @@ -42,22 +43,20 @@ for t in etc1/install/0.1.0 /usr/local; do cppget.org/repository/1/ done - # Test the build2-toolchain INSTALL procedure (plus brep) with the earliest # compiler versions we claim to support and the latest available. # # Note: Clang 3.4 and 3.7 are tested on FreeBSD below (3.4 cannot coexist # with newer versions on Ubuntu). # -for c in g++-4.9 g++-5; do +for c in g++-4.8 g++-4.9 g++-5; do etc/install \ --cxx $c \ --cppflags "-I/usr/include/apache2 -I/usr/include/apr-1.0" \ $src/build2-toolchain-$tcv.tar.gz \ -https://pkg.cppget1/1/alpha +http://pkg.cppget1/1/alpha done - # This doesn't work since libodb, etc are using libstdc++. # if false; then @@ -67,16 +66,14 @@ for c in clang++-3.5 clang++-3.6; do --cppflags "-I/usr/include/apache2 -I/usr/include/apr-1.0" \ --cxxflags --stdlib=libc++ \ $src/build2-toolchain-$tcv.tar.gz \ -https://pkg.cppget1/1/alpha +http://pkg.cppget1/1/alpha done fi - # Test installation requiring sudo. # etc/install -t -i /opt/build2 -s $src/build2-toolchain-$tcv.tar.gz \ -https://pkg.cppget1/1/alpha - +http://pkg.cppget1/1/alpha # Test on FreeBSD with Clang 3.4 (default) and Clang 3.7. # @@ -86,5 +83,37 @@ for c in clang++ clang++37; do ssh freebsd cd /tmp ';' ./install \ --cxx $c \ --cppflags '"-I/usr/local/include/apr-1 -I/usr/local/include/apache24"' \ -build2-toolchain-$tcv.tar.gz https://pkg.cppget1/1/alpha +build2-toolchain-$tcv.tar.gz http://pkg.cppget1/1/alpha done + +# Also run the Intro steps based on the toolchain we just built. +# +scp -r hello/hello2 etc/intro freebsd:/tmp/ + +ssh freebsd cd /tmp ';' ./intro \ +-t /tmp/build2-install \ +-c1 clang++37 \ +-c2 clang++ \ +-c3 "''" \ +-h /tmp/hello2 \ +https://build2.org/pkg/1/hello/ + +# Test on Mac OS (no brep). +# +scp etc/install $src/build2-toolchain-$tcv.tar.gz rbook:/tmp/ + +ssh rbook cd /tmp ';' ./install -t --cxx clang++ --bpkgflags \ +"'--fetch-option --resolve --fetch-option pkg.cppget1:8080:192.168.0.19'" \ +build2-toolchain-$tcv.tar.gz http://pkg.cppget1:8080/1/alpha + +# Again, run the Intro steps based on the toolchain we just built. +# +scp -r hello/hello2 etc/intro rbook:/tmp/ + +ssh rbook cd /tmp ';' ./intro \ +-t /tmp/build2-install \ +-c1 clang++ \ +-c2 "''" \ +-c3 "''" \ +-h /tmp/hello2 \ +https://build2.org/pkg/1/hello/ -- cgit v1.1