Skip to content

Commit 3fd2e1c

Browse files
committed
Updates on tools for test suites
1 parent f792052 commit 3fd2e1c

File tree

2 files changed

+24
-4
lines changed

2 files changed

+24
-4
lines changed

build/bashrc

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,27 @@ gen_mysqlalias()
2424
done < "$input"
2525
}
2626

27+
exec_mysql()
28+
{
29+
input="$1"
30+
name=$2
31+
db=$3
32+
sqlfile=$4
33+
while IFS='' read -r line
34+
do
35+
[ -z "$line" ] && continue
36+
echo "$line" | grep -q $name
37+
[ $? -ne 0 ] && continue
38+
container_port=$(echo "$line" | cut -d\; -f1)
39+
container_name=$(echo "$line" | cut -d\; -f2)
40+
container_datadir=$(echo "$line" | cut -d\; -f3)
41+
image_name=$(echo "$line" | cut -d\; -f4)
42+
43+
44+
echo "* Executing $sqlfile on $container_name"
45+
cat $sqlfile | mysql -u root -h 127.0.0.1 -P $container_port
46+
done < "$input"
47+
}
2748
exec_mysqls()
2849
{
2950
input="$1"

build/createMassDockerImages.sh

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -47,12 +47,14 @@ do
4747
docker ps -a | grep -qE "$container_name^"
4848
docker rm -f $container_name
4949

50+
if [ 1 -eq 0 ]; then
5051
echo "* DELETING DATADIR: $container_datadir"
5152
sudo rm -rf $container_datadir
5253
[ "$1" = "clean" ] && continue
5354

5455
echo "* CREATING DATADIR: $container_datadir"
55-
sudo mkdir $container_datadir
56+
sudo mkdir -p $container_datadir
57+
fi
5658
#sudo chown -R mysql.mysql $container_datadir
5759
sudo chmod 777 $container_datadir
5860
echo "* STARTING CONTAINER: $container_name($container_port/TCP) BASED ON $image_name -> $container_datadir"
@@ -72,11 +74,8 @@ do
7274
ls -ls $container_datadir
7375
#break
7476
docker logs $container_name | grep -q "ready for connections"
75-
alias mysql_$container_name="mysql -u root -P $container_port"
7677
done < "$input"
7778

78-
[ "$1" = "clean" ] || docker system prune -a -f
79-
8079
echo "* LISTING DOCKER IMAGES"
8180
docker images
8281

0 commit comments

Comments
 (0)