This commit is contained in:
Hackerpilot 2016-01-15 00:49:24 -08:00
parent 166db74597
commit 83ab71cc26
27 changed files with 85 additions and 68 deletions

0
tests/actual.txt Normal file
View File

View File

@ -11,35 +11,52 @@ pass_count=0
# Make sure that the server is shut down
echo "Shutting down currently-running server..."
../bin/dcd-client --shutdown 2>/dev/null > /dev/null
../bin/dcd-client --shutdown --tcp 2>/dev/null > /dev/null
sleep 1s;
# Start up the server
echo "Starting server..."
../bin/dcd-server --ignoreConfig -I $IMPORTS 2>stderr.txt > stdout.txt &
sleep 1s;
for socket in unix tcp; do
echo "Running tests for $socket sockets"
# Run tests
for testCase in tc*; do
cd $testCase;
./run.sh;
if [ $? -eq 0 ]; then
echo -e "${YELLOW}$testCase:${NORMAL} ... ${GREEN}Pass${NORMAL}";
let pass_count=pass_count+1
# Start up the server
echo "Starting server..."
if [[ $socket == "unix" ]]; then
../bin/dcd-server --ignoreConfig -I $IMPORTS 2>stderr.txt > stdout.txt &
else
echo -e "${YELLOW}$testCase:${NORMAL} ... ${RED}Fail${NORMAL}";
let fail_count=fail_count+1
../bin/dcd-server --tcp --ignoreConfig -I $IMPORTS 2>stderr.txt > stdout.txt &
fi
sleep 1s;
cd - > /dev/null;
# Run tests
for testCase in tc*; do
cd $testCase
if [[ $socket == "unix" ]]; then
./run.sh ""
else
./run.sh "--tcp"
fi
if [[ $? -eq 0 ]]; then
echo -e "${YELLOW}$socket:$testCase:${NORMAL} ... ${GREEN}Pass${NORMAL}";
let pass_count=pass_count+1
else
echo -e "${YELLOW}$socket:$testCase:${NORMAL} ... ${RED}Fail${NORMAL}";
let fail_count=fail_count+1
fi
cd - > /dev/null;
done
# Shut down
echo "Shutting down server..."
if [[ $socket == "unix" ]]; then
../bin/dcd-client --shutdown 2>/dev/null > /dev/null
else
../bin/dcd-client --shutdown --tcp 2>/dev/null > /dev/null
fi
done
# Shut down
echo "Shutting down server..."
../bin/dcd-client --shutdown 2>/dev/null > /dev/null
# Report
if [ $fail_count -eq 0 ]; then
if [[ $fail_count -eq 0 ]]; then
echo -e "${GREEN}${pass_count} tests passed and ${fail_count} failed.${NORMAL}"
else
echo -e "${RED}${pass_count} tests passed and ${fail_count} failed.${NORMAL}"

View File

@ -1,5 +1,5 @@
set -e
set -u
../../bin/dcd-client file.d -c12 > actual.txt
../../bin/dcd-client $1 file.d -c12 > actual.txt
diff actual.txt expected.txt

View File

@ -1,5 +1,5 @@
set -e
set -u
../../bin/dcd-client file.d -c52 > actual.txt
../../bin/dcd-client $1 file.d -c52 > actual.txt
diff actual.txt expected.txt

View File

@ -1,8 +1,8 @@
set -e
set -u
../../bin/dcd-client file.d -c839 > actual1.txt
../../bin/dcd-client $1 file.d -c839 > actual1.txt
diff actual1.txt expected1.txt
../../bin/dcd-client file.d -c862 > actual2.txt
../../bin/dcd-client $1 file.d -c862 > actual2.txt
diff actual2.txt expected2.txt

View File

@ -1,5 +1,5 @@
set -e
set -u
../../bin/dcd-client file.d -c13 > actual.txt
../../bin/dcd-client $1 file.d -c13 > actual.txt
diff actual.txt expected.txt

View File

@ -1,5 +1,5 @@
set -e
set -u
../../bin/dcd-client file.d -c154 > actual.txt
../../bin/dcd-client $1 file.d -c154 > actual.txt
diff actual.txt expected.txt

View File

@ -1,14 +1,14 @@
set -e
set -u
../../bin/dcd-client file.d -c184 > actual1.txt
../../bin/dcd-client $1 file.d -c184 > actual1.txt
diff actual1.txt expected1.txt
../../bin/dcd-client file.d -c199 > actual2.txt
../../bin/dcd-client $1 file.d -c199 > actual2.txt
diff actual2.txt expected2.txt
../../bin/dcd-client file.d -c216 > actual3.txt
../../bin/dcd-client $1 file.d -c216 > actual3.txt
diff actual3.txt expected3.txt
../../bin/dcd-client file.d -c231 > actual4.txt
../../bin/dcd-client $1 file.d -c231 > actual4.txt
diff actual4.txt expected4.txt

View File

@ -1,8 +1,8 @@
set -e
set -u
../../bin/dcd-client file.d -c97 > actual1.txt
../../bin/dcd-client $1 file.d -c97 > actual1.txt
diff actual1.txt expected1.txt
../../bin/dcd-client file.d -c130 > actual2.txt
../../bin/dcd-client $1 file.d -c130 > actual2.txt
diff actual2.txt expected2.txt

View File

@ -1,5 +1,5 @@
set -e
set -u
../../bin/dcd-client file.d -c113 > actual1.txt
../../bin/dcd-client $1 file.d -c113 > actual1.txt
diff actual1.txt expected1.txt

View File

@ -1,11 +1,11 @@
set -e
set -u
../../bin/dcd-client file.d -c83 > actual1.txt
../../bin/dcd-client $1 file.d -c83 > actual1.txt
diff actual1.txt expected1.txt
../../bin/dcd-client file.d -c93 > actual2.txt
../../bin/dcd-client $1 file.d -c93 > actual2.txt
diff actual2.txt expected2.txt
../../bin/dcd-client file.d -c148 > actual3.txt
../../bin/dcd-client $1 file.d -c148 > actual3.txt
diff actual3.txt expected3.txt

View File

@ -6,12 +6,12 @@ cp testfile1_old.d ../imports/testfile1.d
# than one second
sleep 1s;
../../bin/dcd-client file.d -c84 > actual1.txt
../../bin/dcd-client $1 file.d -c84 > actual1.txt
diff actual1.txt expected1.txt
cp testfile1_new.d ../imports/testfile1.d
# Same here
sleep 1s;
../../bin/dcd-client file.d -c84 > actual2.txt
../../bin/dcd-client $1 file.d -c84 > actual2.txt
diff actual2.txt expected2.txt

View File

@ -1,5 +1,5 @@
set -e
set -u
../../bin/dcd-client file.d -c48 > actual1.txt
../../bin/dcd-client $1 file.d -c48 > actual1.txt
diff actual1.txt expected1.txt

View File

@ -1,8 +1,8 @@
set -e
set -u
../../bin/dcd-client file.d -c35 > actual1.txt
../../bin/dcd-client $1 file.d -c35 > actual1.txt
diff actual1.txt expected1.txt
../../bin/dcd-client file.d -c61 > actual2.txt
../../bin/dcd-client $1 file.d -c61 > actual2.txt
diff actual2.txt expected2.txt

View File

@ -1,8 +1,8 @@
set -e
set -u
../../bin/dcd-client file.d -c187 > actual1.txt
../../bin/dcd-client $1 file.d -c187 > actual1.txt
diff actual1.txt expected1.txt
../../bin/dcd-client file.d -c211 > actual2.txt
../../bin/dcd-client $1 file.d -c211 > actual2.txt
diff actual2.txt expected2.txt

View File

@ -6,12 +6,12 @@ cp testfile2_old.d ../imports/testfile2.d
# than one second
sleep 1s;
../../bin/dcd-client file.d -c39 > actual1.txt
../../bin/dcd-client $1 file.d -c39 > actual1.txt
diff actual1.txt expected1.txt
cp testfile2_new.d ../imports/testfile2.d
# Same here
sleep 1s;
../../bin/dcd-client file.d -c39 > actual2.txt
../../bin/dcd-client $1 file.d -c39 > actual2.txt
diff actual2.txt expected2.txt

View File

@ -1,8 +1,8 @@
set -e
set -u
../../bin/dcd-client file1.d -c84 > actual1.txt
../../bin/dcd-client $1 file1.d -c84 > actual1.txt
diff actual1.txt expected1.txt
../../bin/dcd-client file2.d -c73 > actual2.txt
../../bin/dcd-client $1 file2.d -c73 > actual2.txt
diff actual2.txt expected2.txt

View File

@ -1,8 +1,8 @@
set -e
set -u
../../bin/dcd-client file.d -c24 > actual1.txt
../../bin/dcd-client $1 file.d -c24 > actual1.txt
diff actual1.txt expected1.txt
../../bin/dcd-client file.d -c57 > actual2.txt
../../bin/dcd-client $1 file.d -c57 > actual2.txt
diff actual2.txt expected2.txt

View File

@ -1,5 +1,5 @@
set -e
set -u
../../bin/dcd-client file.d -c33 > actual.txt
../../bin/dcd-client $1 file.d -c33 > actual.txt
diff actual.txt expected.txt

View File

@ -1,8 +1,8 @@
set -e
set -u
../../bin/dcd-client file.d -c61 > actual1.txt
../../bin/dcd-client $1 file.d -c61 > actual1.txt
diff actual1.txt expected1.txt
../../bin/dcd-client file.d -c88 > actual2.txt
../../bin/dcd-client $1 file.d -c88 > actual2.txt
diff actual2.txt expected2.txt

View File

@ -1,8 +1,8 @@
set -e
set -u
../../bin/dcd-client file.d -c84 > actual1.txt
../../bin/dcd-client $1 file.d -c84 > actual1.txt
diff actual1.txt expected1.txt
../../bin/dcd-client file.d -c111 > actual2.txt
../../bin/dcd-client $1 file.d -c111 > actual2.txt
diff actual2.txt expected2.txt

View File

@ -1,8 +1,8 @@
set -e
set -u
../../bin/dcd-client file.d -c159 > actual1.txt
../../bin/dcd-client $1 file.d -c159 > actual1.txt
diff actual1.txt expected1.txt
../../bin/dcd-client file.d -c199 > actual2.txt
../../bin/dcd-client $1 file.d -c199 > actual2.txt
diff actual2.txt expected2.txt

View File

@ -1,5 +1,5 @@
set -e
set -u
../../bin/dcd-client file.d -c1 > actual.txt
../../bin/dcd-client $1 file.d -c1 > actual.txt
diff actual.txt expected.txt

View File

@ -1,5 +1,5 @@
set -e
set -u
../../bin/dcd-client file.d -c16 > actual.txt
../../bin/dcd-client $1 file.d -c16 > actual.txt
diff actual.txt expected.txt

View File

@ -1,8 +1,8 @@
set -e
set -u
../../bin/dcd-client file.d -c117 > actual1.txt
../../bin/dcd-client $1 file.d -c117 > actual1.txt
diff actual1.txt expected1.txt
../../bin/dcd-client file.d -c89 > actual2.txt
../../bin/dcd-client $1 file.d -c89 > actual2.txt
diff actual2.txt expected2.txt

View File

@ -1,23 +1,23 @@
set -e
set -u
../../bin/dcd-client file.d -c286 -d > actual1.txt
../../bin/dcd-client $1 file.d -c286 -d > actual1.txt
diff actual1.txt expected1.txt
../../bin/dcd-client file.d -c290 -d > actual2.txt
../../bin/dcd-client $1 file.d -c290 -d > actual2.txt
diff actual2.txt expected2.txt
../../bin/dcd-client file.d -c294 -d > actual3.txt
../../bin/dcd-client $1 file.d -c294 -d > actual3.txt
diff actual3.txt expected3.txt
../../bin/dcd-client file.d -c298 -d> actual4.txt
../../bin/dcd-client $1 file.d -c298 -d> actual4.txt
diff actual4.txt expected4.txt
../../bin/dcd-client file.d -c302 -d> actual5.txt
../../bin/dcd-client $1 file.d -c302 -d> actual5.txt
diff actual5.txt expected5.txt
../../bin/dcd-client file.d -c306 -d> actual6.txt
../../bin/dcd-client $1 file.d -c306 -d> actual6.txt
diff actual6.txt expected6.txt
../../bin/dcd-client file.d -c313 -d> actual7.txt
../../bin/dcd-client $1 file.d -c313 -d> actual7.txt
diff actual7.txt expected7.txt

View File

@ -1,5 +1,5 @@
set -e
set -u
../../bin/dcd-client file.d -c94 > actual1.txt
../../bin/dcd-client $1 file.d -c94 > actual1.txt
diff actual1.txt expected1.txt