diff --git a/Makefile b/Makefile index 3ab260f..bab6e21 100644 --- a/Makefile +++ b/Makefile @@ -49,6 +49,9 @@ cleanall: clean cleanparser install: cp $(TARGET) $(INSTALL)/lib/$(TARGET) + cp -r src $(INSTALL)/include/hsql + find $(INSTALL)/include/hsql -not -name '*.h' -type f | xargs rm + format: astyle --options=astyle.options $(ALLLIB) diff --git a/README.md b/README.md index 5f8ea54..8056e5e 100644 --- a/README.md +++ b/README.md @@ -36,7 +36,7 @@ To use the SQL parser in your own projects you simply have to follow these few s First step to extending this parser is cloning the repository `git clone git@github.com:hyrise/sql-parser.git` and making sure everything works by running the following steps: -``` +```bash make parser # builds the bison parser and flex lexer make library # builds the libsqlparser.so make test # runs the tests with the library @@ -44,7 +44,7 @@ make test # runs the tests with the library Rerun these steps whenever you change part of the parse. To execute the entire pipeline automatically you can run: -``` +```bash make cleanall # cleans the parser build and library build make test # build parser, library and runs the tests ``` diff --git a/test/test.sh b/test/test.sh index 73b3262..b9d2dc1 100755 --- a/test/test.sh +++ b/test/test.sh @@ -32,6 +32,7 @@ fi printf "\n${GREEN}Running memory leak checks...${NC}\n" valgrind --leak-check=full --error-exitcode=200 --log-fd=3 \ ./bin/sql_tests -f "test/valid_queries.sql" 3>&1 >/dev/null 2>/dev/null +MEM_LEAK_RET=$? if [ $MEM_LEAK_RET -ne 200 ]; then printf "${GREEN}Memory leak check succeeded!${NC}\n"