diff --git a/performance_tests.sh b/performance_tests.sh index 49215c4..a58a256 100755 --- a/performance_tests.sh +++ b/performance_tests.sh @@ -41,7 +41,6 @@ get_bandwidth(){ bw=${bw#*,} elif [ "$1" = "fetching_text" ]; then bw=$(grep -e "\->" fetching_text| grep -o "[[:digit:].]* -> [[:digit:].]* [[:alpha:]]*") - echo "bw vaut $bw" fi } @@ -108,7 +107,7 @@ test4(){ run git pull origin main &> /dev/null get_storage_used . echo "memory usage: $mem" - echo "bandwidth usage unknown" + echo "bandwidth usage : unknown" cd .. run rm -rf $REPO_NAME } @@ -140,7 +139,7 @@ test5(){ echo "memory usage: +$mem" echo "bandwidth usage: $bw" cd ../$REMOTE - git reset --hard -q a99be63309fc4f4600210000583546d966d12d4f + git reset --hard -q HEAD~1 cd ../.. rm -rf performance_testing } @@ -149,10 +148,9 @@ test6(){ section TEST6 run echo 'TEST 6 : case of classic fetching and merging, after removal of a 1M file' #initialization - run git clone $1 &> /dev/null + pwd + run git clone $1 #&> /dev/null cd $REPO_NAME - run git fetch --progress origin &> /dev/null - run git merge --progress origin &> /dev/null get_storage_used . mem_before=$mem #modification of the remote repo @@ -171,7 +169,7 @@ test6(){ echo "memory usage: $mem" echo "bandwidth usage: $bw" cd ../$REMOTE - git reset --hard -q a99be63309fc4f4600210000583546d966d12d4f + git reset --hard -q HEAD~1 cd ../.. rm -rf performance_testing } @@ -182,8 +180,6 @@ test7(){ #initialization run git clone $1 &> /dev/null cd $REPO_NAME - run git fetch --progress origin &> /dev/null - run git merge --progress origin &> /dev/null get_storage_used . mem_before=$mem #modification of the remote repo @@ -197,14 +193,14 @@ test7(){ cd ../../$REPO_NAME #fetching run git fetch --progress origin &> /dev/null - run git merge --progress &> /dev/null + run git merge --progress &> fetching_text get_storage_used . mem_after=$mem mem=$(($mem_after-$mem_before)) echo "memory usage: $mem" - echo "bandwidth usage unknown" + echo "bandwidth usage : unknown" cd ../$REMOTE - git reset --hard -q a99be63309fc4f4600210000583546d966d12d4f + git reset --hard -q HEAD~2 cd ../.. rm -rf performance_testing } @@ -213,10 +209,9 @@ test8(){ section TEST8 run echo 'TEST 8 : case of fetching --depth=1 and merging, after addition of a 1M file' #initialization - run git clone $1 #&> /dev/null + echo $(pwd) + run git clone $1 &> /dev/null cd $REPO_NAME - run git fetch --progress origin &> fetching1 #&> /dev/null is this useless? - run git merge --progress origin &> merging1 #&> /dev/null get_storage_used . mem_before=$mem #modification of the remote repo @@ -225,8 +220,8 @@ test8(){ run git add sample5 run git commit --quiet -m"fourth 1M sample created" cd ../../$REPO_NAME - run git fetch --progress --depth=1 origin &> fetching2 # /dev/null - run git merge --progress --allow-unrelated-histories &> merging2 + run git fetch --progress --depth=1 origin &> /dev/null + run git merge --progress --allow-unrelated-histories &> fetching_text get_storage_used . mem_after=$mem mem=$(($mem_after-$mem_before)) @@ -234,19 +229,17 @@ test8(){ echo "memory usage: +$mem" echo "bandwidth usage: $bw" cd ../$REMOTE - git reset --hard -q a99be63309fc4f4600210000583546d966d12d4f #does not work cause commits change numbers + git reset --hard -q HEAD~1 #does not work cause commits change numbers cd ../.. - #rm -rf performance_testing + rm -rf performance_testing } test9(){ - section TEST9 + section TEST9 run echo 'TEST 9 : case of --depth=1 fetching and merging, after removal of a 1M file' #initialization run git clone $1 &> /dev/null cd $REPO_NAME - run git fetch --progress origin &> /dev/null - run git merge --progress origin &> /dev/null get_storage_used . mem_before=$mem #modification of the remote repo @@ -257,15 +250,14 @@ test9(){ cd ../../$REPO_NAME #fetching run git fetch --progress --depth=1 origin &> /dev/null - run git merge --progress &> fetching_text + run git merge --progress --allow-unrelated-histories &> /dev/null get_storage_used . mem_after=$mem mem=$(($mem_after-$mem_before)) - get_bandwidth fetching_text echo "memory usage: $mem" - echo "bandwidth usage: $bw" + echo "bandwidth usage: unknown" cd ../$REMOTE - git reset --hard -q a99be63309fc4f4600210000583546d966d12d4f + git reset --hard -q HEAD~1 cd ../.. rm -rf performance_testing } @@ -278,8 +270,7 @@ test10(){ run git fetch --progress origin &> /dev/null run git merge --progress origin &> /dev/null get_storage_used . - mem_before=$mem - echo "mem before is $mem_before" + mem_before=$mem #modification of the remote repo cd ../$REMOTE create_random_file 'sample5' '1M' #adding a 1M file @@ -290,16 +281,15 @@ test10(){ run git commit --quiet -m"1M "sample5" deleted" cd ../../$REPO_NAME #fetching - run git fetch --progress --depth=1 origin &> /fetching_text #dev/null - run git merge --progress &> merging_text #/dev/null + run git fetch --progress --depth=1 origin &> /dev/null + run git merge --progress --allow-unrelated-histories &> /dev/null get_storage_used . mem_after=$mem - echo "mem after is $mem_before" mem=$(($mem_after-$mem_before)) echo "memory usage: $mem" - echo "bandwidth usage unknown" + echo "bandwidth usage : unknown" cd ../$REMOTE - git reset --hard -q a99be63309fc4f4600210000583546d966d12d4f + git reset --hard -q HEAD~2 cd ../.. rm -rf performance_testing }