From 3d25fd4a6c188f6183e69693920f81e3bc4e474f Mon Sep 17 00:00:00 2001 From: Paul Floyd Date: Tue, 5 Oct 2021 09:12:45 +0200 Subject: [PATCH] FreeBSD support, patch 8b nightly directory --- nightly/bin/nightly | 22 ++++++++++++++++++---- nightly/conf/freebsd12.1.conf | 4 ++++ nightly/conf/freebsd12.1.sendmail | 8 ++++++++ 3 files changed, 30 insertions(+), 4 deletions(-) create mode 100644 nightly/conf/freebsd12.1.conf create mode 100755 nightly/conf/freebsd12.1.sendmail diff --git a/nightly/bin/nightly b/nightly/bin/nightly index 92fa076286..370a181114 100755 --- a/nightly/bin/nightly +++ b/nightly/bin/nightly @@ -42,6 +42,14 @@ runcmd () { # Startup #---------------------------------------------------------------------------- +if [ `uname -o` = "FreeBSD" ]; then + CP=gcp + MAKE=gmake +else + CP=cp + MAKE=make +fi + valgrind_git_repo="git://sourceware.org/git/valgrind.git/" # Must have exactly two arguments @@ -72,7 +80,7 @@ if [ "${ABT_EVAL}" = "" ]; then ABT_EVAL="eval" fi if [ "${ABT_RUN_REGTEST}" = "" ]; then - ABT_RUN_REGTEST="make regtest" + ABT_RUN_REGTEST="${MAKE} regtest" fi if [ "${ABT_PERF_TOOLS}" = "" ]; then @@ -118,7 +126,7 @@ for logfile in old new ; do # Check out, build, run tests runcmd $logfile \ "Checking out Valgrind source tree" \ - "cp -r --preserve=links valgrind-repo valgrind-$logfile && cd valgrind-$logfile && git checkout ${git_commit}" && \ + "${CP} -r --preserve=links valgrind-repo valgrind-$logfile && cd valgrind-$logfile && git checkout ${git_commit}" && \ \ runcmd $logfile \ "Configuring valgrind " \ @@ -126,7 +134,7 @@ for logfile in old new ; do \ runcmd $logfile \ "Building valgrind " \ - "cd valgrind-$logfile && make -j ${ABT_JOBS} && make -j ${ABT_JOBS} check && make install" && \ + "cd valgrind-$logfile && ${MAKE} -j ${ABT_JOBS} && ${MAKE} -j ${ABT_JOBS} check && ${MAKE} install" && \ \ runcmd $logfile \ "Running regression tests " \ @@ -177,11 +185,17 @@ END=`date "+%F %H:%M:%S %Z"` # Gather some information about this run and its environment valgrind_revision=$( ./valgrind-new/vg-in-place -v --version ) -gcc_version="`gcc --version 2> /dev/null | head -1`" +if [ `uname -o` = "FreeBSD" ]; then + gcc_version="`clang --version 2> /dev/null | head -1`" +else + gcc_version="`gcc --version 2> /dev/null | head -1`" +fi gdb_version="`gdb --version 2> /dev/null | head -1`" as_version="`as --version 2> /dev/null | head -1`" if [ `uname -o` = "Solaris" ]; then libc="Solaris libc" +elif [ `uname -o` = "FreeBSD" ]; then + libc="FreeBSD libc" else libc_so="`ls -1 /lib/libc.so.* /lib64/libc.so.* /lib32/libc.so.* /lib/*-linux-gnu/libc.so.* 2>/dev/null | tail -1`" libc="unknown" diff --git a/nightly/conf/freebsd12.1.conf b/nightly/conf/freebsd12.1.conf new file mode 100644 index 0000000000..c76383ed5c --- /dev/null +++ b/nightly/conf/freebsd12.1.conf @@ -0,0 +1,4 @@ +export ABT_DETAILS=`uname -mrs` +export ABT_JOBS=2 +#export ABT_PERF="--tools=none,memcheck,callgrind,helgrind,cachegrind,drd,massif --reps=3 --vg=../valgrind-old --vg=../valgrind-new" +export ABT_CONFIGURE_OPTIONS="CC=clang CXX=clang++" diff --git a/nightly/conf/freebsd12.1.sendmail b/nightly/conf/freebsd12.1.sendmail new file mode 100755 index 0000000000..6fc10f9deb --- /dev/null +++ b/nightly/conf/freebsd12.1.sendmail @@ -0,0 +1,8 @@ +#!/bin/sh + +subject=$1 +body=$2 +file=$3 +filename=$( basename $3 ) + +(cat "$body" "$file") | mail -s "$subject" valgrind-testresults@lists.sourceforge.net -f "Paul Floyd " -- 2.43.5