From cda2513595c66c251477d5780586df6e2313725b Mon Sep 17 00:00:00 2001 From: Anjali Kulkarni Date: Tue, 19 Mar 2024 13:17:09 -0700 Subject: [PATCH 1/6] Fix mem.sh bug Need to cd to the correct directory before doing make. Signed-off-by: Anjali Kulkarni --- tests/MEM/mem.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tests/MEM/mem.sh b/tests/MEM/mem.sh index 786146b..99c1424 100755 --- a/tests/MEM/mem.sh +++ b/tests/MEM/mem.sh @@ -1,6 +1,10 @@ #!/bin/sh # Enable -DTESTING in Makefile and the recompile library - make + +export LD_LIBRARY_PATH=`git rev-parse --show-toplevel` +cd $LD_LIBRARY_PATH/tests/MEM + make clean make mem_test From dad18c6810277dcdc97bbceaa5e2634643565a27 Mon Sep 17 00:00:00 2001 From: Anjali Kulkarni Date: Tue, 19 Mar 2024 13:40:34 -0700 Subject: [PATCH 2/6] mem.sh fix Trying the correct -I flag to Makefile. Signed-off-by: Anjali Kulkarni --- tests/MEM/Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/MEM/Makefile b/tests/MEM/Makefile index ad590dd..22d65de 100644 --- a/tests/MEM/Makefile +++ b/tests/MEM/Makefile @@ -1,5 +1,6 @@ CC = gcc -export LD_LIBRARY_PATH = `git rev-parse --show-toplevel` +#export LD_LIBRARY_PATH = `git rev-parse --show-toplevel` +export LD_LIBRARY_PATH=/home/runner/work/libresource/libresource CFLAGS = -g -Wall -Werror -I $(LD_LIBRARY_PATH) -std=gnu99 -L $(LD_LIBRARY_PATH) -lresource REXE = mem_test mem_test_cg MFILES = mem_info.* From 3b9b21a62bfca7690f13b0a37ca85203ba5feded Mon Sep 17 00:00:00 2001 From: Anjali Kulkarni Date: Tue, 19 Mar 2024 14:01:48 -0700 Subject: [PATCH 3/6] mem.sh trying cc Signed-off-by: Anjali Kulkarni --- tests/MEM/Makefile | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/tests/MEM/Makefile b/tests/MEM/Makefile index 22d65de..36dbf49 100644 --- a/tests/MEM/Makefile +++ b/tests/MEM/Makefile @@ -1,6 +1,5 @@ -CC = gcc -#export LD_LIBRARY_PATH = `git rev-parse --show-toplevel` -export LD_LIBRARY_PATH=/home/runner/work/libresource/libresource +CC = cc +export LD_LIBRARY_PATH = `git rev-parse --show-toplevel` CFLAGS = -g -Wall -Werror -I $(LD_LIBRARY_PATH) -std=gnu99 -L $(LD_LIBRARY_PATH) -lresource REXE = mem_test mem_test_cg MFILES = mem_info.* From f7044b5590bac7e38e913837cd606d7d35ed96bf Mon Sep 17 00:00:00 2001 From: Anjali Kulkarni Date: Tue, 19 Mar 2024 14:43:23 -0700 Subject: [PATCH 4/6] mem.sh Signed-off-by: Anjali Kulkarni --- tests/MEM/Makefile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/tests/MEM/Makefile b/tests/MEM/Makefile index 36dbf49..a9a4c07 100644 --- a/tests/MEM/Makefile +++ b/tests/MEM/Makefile @@ -1,11 +1,12 @@ -CC = cc +CC = gcc export LD_LIBRARY_PATH = `git rev-parse --show-toplevel` CFLAGS = -g -Wall -Werror -I $(LD_LIBRARY_PATH) -std=gnu99 -L $(LD_LIBRARY_PATH) -lresource REXE = mem_test mem_test_cg MFILES = mem_info.* mem_test: mem_test.c - $(CC) $(CFLAGS) -o $@ $^ + $(CC) $(CFLAGS) -o mem_test mem_test.c + #$(CC) $(CFLAGS) -o $@ $^ mem_test_cg: mem_test_cg.c $(CC) $(CFLAGS) -o $@ $^ From 3e46abcc82b217beb97b69e42246058c32a85a32 Mon Sep 17 00:00:00 2001 From: Anjali Kulkarni Date: Tue, 19 Mar 2024 14:52:08 -0700 Subject: [PATCH 5/6] mem.sh fix try Signed-off-by: Anjali Kulkarni --- tests/MEM/Makefile | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/tests/MEM/Makefile b/tests/MEM/Makefile index a9a4c07..08ee978 100644 --- a/tests/MEM/Makefile +++ b/tests/MEM/Makefile @@ -1,12 +1,11 @@ CC = gcc export LD_LIBRARY_PATH = `git rev-parse --show-toplevel` -CFLAGS = -g -Wall -Werror -I $(LD_LIBRARY_PATH) -std=gnu99 -L $(LD_LIBRARY_PATH) -lresource +CFLAGS = -v -g -Wall -Werror -I $(LD_LIBRARY_PATH) -std=gnu99 -L $(LD_LIBRARY_PATH) -lresource REXE = mem_test mem_test_cg MFILES = mem_info.* mem_test: mem_test.c - $(CC) $(CFLAGS) -o mem_test mem_test.c - #$(CC) $(CFLAGS) -o $@ $^ + $(CC) $(CFLAGS) -o $@ $^ mem_test_cg: mem_test_cg.c $(CC) $(CFLAGS) -o $@ $^ From e0d6646f25a31f98f6143a75db137eea666c89d9 Mon Sep 17 00:00:00 2001 From: Anjali Kulkarni Date: Tue, 19 Mar 2024 14:57:37 -0700 Subject: [PATCH 6/6] -lresource seems missing Signed-off-by: Anjali Kulkarni --- tests/MEM/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/MEM/Makefile b/tests/MEM/Makefile index 08ee978..7c0cca2 100644 --- a/tests/MEM/Makefile +++ b/tests/MEM/Makefile @@ -1,11 +1,11 @@ CC = gcc export LD_LIBRARY_PATH = `git rev-parse --show-toplevel` -CFLAGS = -v -g -Wall -Werror -I $(LD_LIBRARY_PATH) -std=gnu99 -L $(LD_LIBRARY_PATH) -lresource +CFLAGS = -v -g -Wall -Werror -I $(LD_LIBRARY_PATH) -std=gnu99 -L $(LD_LIBRARY_PATH) REXE = mem_test mem_test_cg MFILES = mem_info.* mem_test: mem_test.c - $(CC) $(CFLAGS) -o $@ $^ + $(CC) $(CFLAGS) -o $@ $^ -lresource mem_test_cg: mem_test_cg.c $(CC) $(CFLAGS) -o $@ $^