commit f0cbea295ce08d7cd5153335728984d392646ab3 parent 11b07e7fa3b2e6fe67297636d72180c757e2e3b5 Author: Kyle Milz <kyle@0x30.net> Date: Sat, 6 Aug 2016 16:11:10 -0600 Test: use in tree tools for end to end testing Diffstat:
| M | Test/Package.pm | | | 4 | ++-- |
| M | bin/openbsd/ccitrunrun/Makefile | | | 5 | ++--- |
| M | tt/ccitrunrun.t | | | 2 | +- |
3 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/Test/Package.pm b/Test/Package.pm @@ -17,15 +17,15 @@ sub new { $self->{port} = "/usr/ports/$name"; $ENV{CITRUN_SOCKET} = $self->{dir} . "/test.socket"; + my $cwd = cwd; system(<<EOF) == 0 or die "build failed."; set -e make -C $self->{port} full-build-depends > $self->{dir}/deps -pkg_info citrun > /dev/null doas pkg_add -zl $self->{dir}/deps make -C $self->{port} clean=all -make -C $self->{port} PORTPATH="/usr/local/share/citrun:\\\${WRKDIR}/bin:\$PATH" +make -C $self->{port} PORTPATH="$cwd/src:\\\${WRKDIR}/bin:\$PATH" EOF return $self; diff --git a/bin/openbsd/ccitrunrun/Makefile b/bin/openbsd/ccitrunrun/Makefile @@ -13,15 +13,14 @@ PERMIT_PACKAGE_CDROM = Yes MASTER_SITES = ${HOMEPAGE}/src/ -WANTLIB += GL GLU GLEW glut c citrun freetype m pthread z +WANTLIB += GL GLU GLEW glut c freetype m pthread z # -std=c++11 MODULES = gcc4 MODGCC4_ARCHS = * MODGCC4_LANGS = c++ -LIB_DEPENDS = devel/citrun \ - graphics/freeglut \ +LIB_DEPENDS = graphics/freeglut \ graphics/glew BUILD_DEPENDS = devel/jam \ diff --git a/tt/ccitrunrun.t b/tt/ccitrunrun.t @@ -11,7 +11,7 @@ system("rm -rf /usr/ports/devel/ccitrunrun; cp -R bin/openbsd/ccitrunrun /usr/po my $package = Test::Package->new("devel/ccitrunrun"); my $viewer = Test::Viewer->new(); -system("citrun-check /usr/ports/pobj/ccitrunrun-*"); +system("./src/citrun-check /usr/ports/pobj/ccitrunrun-*"); my $exp = Expect->spawn("/usr/ports/pobj/ccitrunrun-*/citrun-*/src/ccitrunrun-gl"); $viewer->accept();