Skip to content

Commit ba1a663

Browse files
committed
Finalized makefile
- Removed personal tests - Added to make clean the cleaning of the socket file and the library directory - Changed default socket name to /tmp/LSO_socket.sk
1 parent a360552 commit ba1a663

File tree

6 files changed

+10
-161
lines changed

6 files changed

+10
-161
lines changed

Makefile

+3-17
Original file line numberDiff line numberDiff line change
@@ -96,29 +96,15 @@ create_dirs:
9696

9797
.PHONY: clean
9898
clean: cleanTests
99-
@echo "Removing object files and executables..."
99+
@echo "Removing object files, libraries, logs and executables..."
100100
@rm -f vgcore.*
101101
@rm -rf $(OBJ_DIR)/*
102102
@rm -rf $(BIN_DIR)/*
103+
@rm -rf $(LIB_DIR)/*
103104
@rm -rf $(LOG_DIR)/*
105+
@rm -f /tmp/LSO_socket.sk
104106
@echo "Cleaning complete!"
105107

106-
# ---------------- Personal Tests ---------------- #
107-
.PHONY: list_test hashtable_test
108-
109-
PTEST_DEPS := $(LIB_DIR)/libutil.so
110-
PTEST_LIBS := $(DYN_LINK) -lutil
111-
112-
hashtable_test : $(BIN_DIR)/hashtable_test
113-
114-
$(BIN_DIR)/hashtable_test : $(TEST_DIR)/hashtable_test.c $(LIB_DIR)/libutil.so
115-
$(CC) $(CFLAGS) $(PTEST_LIBS) $< -o $@
116-
117-
list_test: $(BIN_DIR)/list_test
118-
119-
$(BIN_DIR)/list_test: $(TEST_DIR)/list_test.c $(LIB_DIR)/libutil.so
120-
$(CC) $(CFLAGS) $(PTEST_LIBS) $< -o $@
121-
122108
# ---------------- Official Tests ---------------- #
123109
.PHONY : test1 test2
124110
.PHONY : cleanTests cleanTest1 cleanTest2

config/config.txt

+5-4
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
1-
no_worker = 5
2-
max_space= 64
1+
no_worker = 1
2+
max_space= 128
33

4-
max_files = 20
4+
max_files = 10000
55

6-
sock_path = socket
6+
cache_pol=LRU
7+
sock_path = /tmp/LSO_socket.sk
78

89

910

scripts/test1.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/bin/bash
22

3-
SOCK_NAME=socket
3+
SOCK_NAME=/tmp/LSO_socket.sk
44
CONFIG=test1_config.txt
55

66
GREEN="\033[0;32m"

scripts/test2.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/bin/bash
22

3-
SOCK_NAME=socket
3+
SOCK_NAME=/tmp/LSO_socket.sk
44
CONFIG=test2_config.txt
55
POLICY=$1
66

tests/hashtable_test.c

-62
This file was deleted.

tests/list_test.c

-76
This file was deleted.

0 commit comments

Comments
 (0)