Skip to content

Commit ede8d5a

Browse files
committed
keep .git folder
1 parent 280ca14 commit ede8d5a

File tree

1 file changed

+9
-6
lines changed

1 file changed

+9
-6
lines changed

get.sh

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -570,6 +570,7 @@ getTestKitGen()
570570
echo "git checkout -q -f $tkg_sha"
571571
git checkout -q -f $tkg_sha
572572

573+
checkTestRepoSHAs
573574
}
574575

575576
getCustomJtreg()
@@ -660,7 +661,9 @@ getFunctionalTestMaterial()
660661
mv openj9/test/functional functional
661662
fi
662663

663-
rm -rf openj9
664+
cd openj9
665+
find . -mindepth 1 ! -name ".git" ! -path "./.git/*" -exec rm -rf {} +
666+
cd $TESTDIR
664667
}
665668

666669
getVendorTestMaterial() {
@@ -745,7 +748,10 @@ getVendorTestMaterial() {
745748
fi
746749

747750
# clean up
748-
rm -rf $dest
751+
cd $dest
752+
find . -mindepth 1 ! -name ".git" ! -path "./.git/*" -exec rm -rf {} +
753+
cd $TESTDIR
754+
749755
done
750756
}
751757

@@ -807,11 +813,8 @@ testJavaVersion()
807813

808814
checkRepoSHA()
809815
{
810-
sha_file="$TESTDIR/TKG/SHAs.txt"
811-
echo "$TESTDIR/TKG/scripts/getSHAs.sh --repo_dir $1 --output_file $sha_file"
812-
$TESTDIR/TKG/scripts/getSHAs.sh --test_root_dir $1 --shas_file $sha_file
813-
814816
testenv_file="$TESTDIR/testenv/testenv.properties"
817+
815818
echo "$TESTDIR/TKG/scripts/getTestenvProperties.sh --repo_dir $1 --output_file $testenv_file --repo_name $2"
816819
$TESTDIR/TKG/scripts/getTestenvProperties.sh --repo_dir $1 --output_file $testenv_file --repo_name $2
817820
}

0 commit comments

Comments
 (0)