Skip to content

Commit 7f3901a

Browse files
committed
[NOBIN] Refactored test/build scripts. Added script for testing qt4 build
1 parent 972a921 commit 7f3901a

File tree

4 files changed

+21
-11
lines changed

4 files changed

+21
-11
lines changed

build.sh

+4-2
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,11 @@ else
2727
exit -1
2828
fi
2929

30-
mkdir build
30+
BUILD_DIR=build
31+
32+
mkdir $BUILD_DIR
3133
echo "[+] build directory created"
32-
cd build
34+
cd $BUILD_DIR
3335
cmake -G "CodeLite - Unix Makefiles" -DUSE_QT4=OFF -DCMAKE_INSTALL_PREFIX:PATH=$(pwd) ..
3436
cmake --build . --target install
3537

build_qt4.sh

+7-8
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,11 @@ else
2727
exit -1
2828
fi
2929

30-
mkdir build_qt4
30+
BUILD_DIR=build_qt4
31+
32+
mkdir $BUILD_DIR
3133
echo "[+] build directory created"
32-
cd build_qt4
33-
cmake -G "CodeLite - Unix Makefiles" -D USE_QT4=ON ../
34-
make
35-
cd ..
36-
cp build_qt4/commander/bearcommander ./build_qt4/
37-
echo "[+] Success! You can check the executable here:"
38-
pwd
34+
cd $BUILD_DIR
35+
cmake -G "CodeLite - Unix Makefiles" -DUSE_QT4=ON -DCMAKE_INSTALL_PREFIX:PATH=$(pwd) ..
36+
cmake --build . --target install
37+

test.sh

+7-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
#!/bin/bash
22
START_DIR=$(pwd)
33
SOURCE_DIR=$1
4+
BUILD_DIR=$2
45
TESTS_DIR="test_cases"
56

67
if [[ "$SOURCE_DIR" == "" ]]; then
@@ -17,7 +18,12 @@ else
1718
mv bearparser_tests $TESTS_DIR
1819
fi
1920

20-
BCMD_DIR=$(pwd)/build/
21+
if [[ "$BUILD_DIR" == "" ]]; then
22+
BUILD_DIR=build
23+
fi
24+
echo "Build Dir: ""$BUILD_DIR"
25+
26+
BCMD_DIR=$(pwd)/$BUILD_DIR/
2127
FAILED=0
2228

2329
tests_list=$SOURCE_DIR/"tests_list.txt"

test_qt4.sh

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
#!/bin/bash
2+
./test.sh $(pwd) build_qt4
3+

0 commit comments

Comments
 (0)