proxmox-mirrors/proxmox-perl-rs
1
0
Fork 0
mirror of https://git.proxmox.com/git/proxmox-perl-rs synced 2025-05-23 14:13:28 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

pve: build test stub of Proxmox::Lib::PVE for tests

Browse Source 
this replaces the libdirs() sub with one containing:
- ../target (for when run from build/pve-rs)
- ../../target (for when run from toplevel/pve-rs

This way we can run 'make check' both from within `pve-rs`
as well as from the package building process.

Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>
This commit is contained in:
Wolfgang Bumiller 2022-11-15 13:35:23 +01:00
parent 08eba82025
commit 13e3d8b87e
2 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pve-rs/Makefile
View File

@ -20,11 +20,18 @@ PM_DIR := PVE
ifeq ($(BUILD_MODE), release) ifeq ($(BUILD_MODE), release)
CARGO_BUILD_ARGS += --release CARGO_BUILD_ARGS += --release
TARGET_DIR=release
else
TARGET_DIR=debug
endif endif
all: PVE Proxmox/Lib/PVE.pm all: PVE Proxmox/Lib/PVE.pm
ifneq ($(BUILD_MODE), skip) ifneq ($(BUILD_MODE), skip)
cargo build $(CARGO_BUILD_ARGS) cargo build $(CARGO_BUILD_ARGS)
mkdir -p test/Proxmox/Lib
sed -r -e \
's@^sub libdirs.*$$@sub libdirs { return ("../target/$(TARGET_DIR)", "../../target/$(TARGET_DIR)"); }@' \
Proxmox/Lib/PVE.pm >test/Proxmox/Lib/PVE.pm
endif endif
PVE: ../scripts/genpackage.pl PVE: ../scripts/genpackage.pl
@ -38,6 +45,9 @@ Proxmox/Lib/PVE.pm: ../Proxmox/Lib/template.pm
mkdir -p Proxmox/Lib mkdir -p Proxmox/Lib
$(call package_template,PVE,pve_rs,../) $(call package_template,PVE,pve_rs,../)
check: all
$(MAKE) -C test test
# always re-create this dir # always re-create this dir
# but also copy the local target/ and PVE/ dirs as a build-cache # but also copy the local target/ and PVE/ dirs as a build-cache
.PHONY: build .PHONY: build

9
pve-rs/test/Makefile
View File

@ -1,4 +1,9 @@
.PHONY: test .PHONY: test
test: test: Proxmox/Lib/PVE.pm
@echo "-- running pve-rs tests --" @echo "-- running pve-rs tests --"
./resource_scheduling.pl perl -I. -I.. -I../.. ./resource_scheduling.pl
# The test stub, we don't know where to look for the library from in here!
Proxmox/Lib/PVE.pm:
@echo "run 'make' in the pve-rs/ dir first"
@exit 1