From 136c271c72a61b9cc5572276288862bb3b2ea8ff Mon Sep 17 00:00:00 2001 From: Lennox <105095085+LennoxLiu@users.noreply.github.com> Date: Mon, 8 Apr 2024 15:01:07 +0200 Subject: [PATCH] Run make from test folder --- hpc/hq_scripts/job.sh | 2 +- hpc/test/MultiplyBy2/Makefile | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/hpc/hq_scripts/job.sh b/hpc/hq_scripts/job.sh index a482d7d..340ebfb 100755 --- a/hpc/hq_scripts/job.sh +++ b/hpc/hq_scripts/job.sh @@ -27,7 +27,7 @@ function get_avaliable_port { } port=$(get_avaliable_port) -export PORT=$port && ./server --port $port & # CHANGE ME! +export PORT=$port && ./test/MultiplyBy2/server --port $port & # CHANGE ME! load_balancer_dir="./test/MultiplyBy2/" # CHANGE ME! diff --git a/hpc/test/MultiplyBy2/Makefile b/hpc/test/MultiplyBy2/Makefile index f1417f9..474a2bf 100644 --- a/hpc/test/MultiplyBy2/Makefile +++ b/hpc/test/MultiplyBy2/Makefile @@ -1,12 +1,12 @@ all: build-server build-lb run-lb -load-balancer-files = ../../LoadBalancer.cpp ../../LoadBalancer.hpp ../../lib/httplib.h ../../lib/json.hpp ../../lib/umbridge.h +load-balancer-files = ../../LoadBalancer.cpp ../../LoadBalancer.hpp ../../../lib/httplib.h ../../../lib/json.hpp ../../../lib/umbridge.h build-server: g++ -O3 -w -std=c++11 minimal-server.cpp -o server -lssl -lcrypto -pthread build-lb: - g++ -O3 -Wno-unused-result -std=c++17 $(load-balancer-files) -o load-balancer -pthread + g++ -O3 -Wno-unused-result -std=c++17 $(load-balancer-files) -o ../../load-balancer -pthread run-lb: - ./load-balancer \ No newline at end of file + cd ../../ && ./load-balancer \ No newline at end of file