From 73ed0af158645b3e8db3f1b8f80bc16ffebc2d36 Mon Sep 17 00:00:00 2001 From: Thomas Lamprecht Date: Wed, 20 Jun 2018 12:47:03 +0200 Subject: [PATCH] cleanup: move bin/test to toplevel Signed-off-by: Thomas Lamprecht --- Makefile | 4 ++-- bin/Makefile | 6 ------ {bin/test => test}/Makefile | 6 +++--- {bin/test => test}/ReplicationTestEnv.pm | 0 {bin/test => test}/balloontest.pl | 0 {bin/test => test}/perftest2.pl | 0 {bin/test => test}/perftest3.pl | 0 {bin/test => test}/replication_test1.pl | 0 {bin/test => test}/replication_test2.pl | 0 {bin/test => test}/replication_test3.pl | 0 {bin/test => test}/replication_test4.log | 0 {bin/test => test}/replication_test4.pl | 0 {bin/test => test}/replication_test5.log | 0 {bin/test => test}/replication_test5.pl | 0 {bin/test => test}/replication_test6.log | 0 {bin/test => test}/replication_test6.pl | 0 16 files changed, 5 insertions(+), 11 deletions(-) rename {bin/test => test}/Makefile (86%) rename {bin/test => test}/ReplicationTestEnv.pm (100%) rename {bin/test => test}/balloontest.pl (100%) rename {bin/test => test}/perftest2.pl (100%) rename {bin/test => test}/perftest3.pl (100%) rename {bin/test => test}/replication_test1.pl (100%) rename {bin/test => test}/replication_test2.pl (100%) rename {bin/test => test}/replication_test3.pl (100%) rename {bin/test => test}/replication_test4.log (100%) rename {bin/test => test}/replication_test4.pl (100%) rename {bin/test => test}/replication_test5.log (100%) rename {bin/test => test}/replication_test5.pl (100%) rename {bin/test => test}/replication_test6.log (100%) rename {bin/test => test}/replication_test6.pl (100%) diff --git a/Makefile b/Makefile index f44e1a50..feaf3a03 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ export SOURCE_DATE_EPOCH ?= $(shell dpkg-parsechangelog -STimestamp) DESTDIR= -SUBDIRS = aplinfo PVE bin www services configs network-hooks +SUBDIRS = aplinfo PVE bin www services configs network-hooks test ARCH:=$(shell dpkg-architecture -qDEB_BUILD_ARCH) GITVERSION:=$(shell git rev-parse HEAD) @@ -14,7 +14,7 @@ DEB=${PACKAGE}_${VERSION}-${PACKAGERELEASE}_${ARCH}.deb all: ${SUBDIRS} check: - ${MAKE} -C bin/test check + ${MAKE} -C test check .PHONY: dinstall dinstall: ${DEB} diff --git a/bin/Makefile b/bin/Makefile index f599e2d1..ddc3915b 100644 --- a/bin/Makefile +++ b/bin/Makefile @@ -4,10 +4,6 @@ include ../defines.mk export NOVIEW=1 include /usr/share/pve-doc-generator/pve-doc-generator.mk -export PERLLIB=.. - -SUBDIRS = test - SERVICES = pvestatd pveproxy pvedaemon spiceproxy CLITOOLS = vzdump pvesubscription pveceph pveam pvesr pvenode @@ -75,10 +71,8 @@ install: ${SCRIPTS} ${CLI_MANS} ${SERVICE_MANS} pvemailforward $(addsuffix .serv install -m 0644 ${SERVICE_MANS} ${MAN8DIR} for i in ${CLITOOLS}; do install -m 0644 -D $$i.bash-completion ${BASHCOMPLDIR}/$$i; done for i in ${SERVICES}; do install -m 0644 -D $$i.service-bash-completion ${BASHCOMPLDIR}/$$i; done - set -e && for i in ${SUBDIRS}; do ${MAKE} -C $$i $@; done .PHONY: clean clean: make cleanup-docgen rm -rf *~ *.tmp ${CLI_MANS} ${SERVICE_MANS} *.1.pod *.8.pod pvemailforward *.bash-completion *.service-bash-completion - set -e && for i in ${SUBDIRS}; do ${MAKE} -C $$i $@; done diff --git a/bin/test/Makefile b/test/Makefile similarity index 86% rename from bin/test/Makefile rename to test/Makefile index 7b4ae4e8..cd934838 100644 --- a/bin/test/Makefile +++ b/test/Makefile @@ -1,7 +1,9 @@ -include ../../defines.mk +include ../defines.mk all: +export PERLLIB=.. + check: ./balloontest.pl ./replication_test1.pl @@ -11,10 +13,8 @@ check: ./replication_test5.pl ./replication_test6.pl - .PHONY: install install: - # do nothing .PHONY: clean clean: diff --git a/bin/test/ReplicationTestEnv.pm b/test/ReplicationTestEnv.pm similarity index 100% rename from bin/test/ReplicationTestEnv.pm rename to test/ReplicationTestEnv.pm diff --git a/bin/test/balloontest.pl b/test/balloontest.pl similarity index 100% rename from bin/test/balloontest.pl rename to test/balloontest.pl diff --git a/bin/test/perftest2.pl b/test/perftest2.pl similarity index 100% rename from bin/test/perftest2.pl rename to test/perftest2.pl diff --git a/bin/test/perftest3.pl b/test/perftest3.pl similarity index 100% rename from bin/test/perftest3.pl rename to test/perftest3.pl diff --git a/bin/test/replication_test1.pl b/test/replication_test1.pl similarity index 100% rename from bin/test/replication_test1.pl rename to test/replication_test1.pl diff --git a/bin/test/replication_test2.pl b/test/replication_test2.pl similarity index 100% rename from bin/test/replication_test2.pl rename to test/replication_test2.pl diff --git a/bin/test/replication_test3.pl b/test/replication_test3.pl similarity index 100% rename from bin/test/replication_test3.pl rename to test/replication_test3.pl diff --git a/bin/test/replication_test4.log b/test/replication_test4.log similarity index 100% rename from bin/test/replication_test4.log rename to test/replication_test4.log diff --git a/bin/test/replication_test4.pl b/test/replication_test4.pl similarity index 100% rename from bin/test/replication_test4.pl rename to test/replication_test4.pl diff --git a/bin/test/replication_test5.log b/test/replication_test5.log similarity index 100% rename from bin/test/replication_test5.log rename to test/replication_test5.log diff --git a/bin/test/replication_test5.pl b/test/replication_test5.pl similarity index 100% rename from bin/test/replication_test5.pl rename to test/replication_test5.pl diff --git a/bin/test/replication_test6.log b/test/replication_test6.log similarity index 100% rename from bin/test/replication_test6.log rename to test/replication_test6.log diff --git a/bin/test/replication_test6.pl b/test/replication_test6.pl similarity index 100% rename from bin/test/replication_test6.pl rename to test/replication_test6.pl