File tree Expand file tree Collapse file tree 1 file changed +9
-6
lines changed Expand file tree Collapse file tree 1 file changed +9
-6
lines changed Original file line number Diff line number Diff line change @@ -570,6 +570,7 @@ getTestKitGen()
570
570
echo " git checkout -q -f $tkg_sha "
571
571
git checkout -q -f $tkg_sha
572
572
573
+ checkTestRepoSHAs
573
574
}
574
575
575
576
getCustomJtreg ()
@@ -660,7 +661,9 @@ getFunctionalTestMaterial()
660
661
mv openj9/test/functional functional
661
662
fi
662
663
663
- rm -rf openj9
664
+ cd openj9
665
+ find . -mindepth 1 ! -name " .git" ! -path " ./.git/*" -exec rm -rf {} +
666
+ cd $TESTDIR
664
667
}
665
668
666
669
getVendorTestMaterial () {
@@ -745,7 +748,10 @@ getVendorTestMaterial() {
745
748
fi
746
749
747
750
# clean up
748
- rm -rf $dest
751
+ cd $dest
752
+ find . -mindepth 1 ! -name " .git" ! -path " ./.git/*" -exec rm -rf {} +
753
+ cd $TESTDIR
754
+
749
755
done
750
756
}
751
757
@@ -807,11 +813,8 @@ testJavaVersion()
807
813
808
814
checkRepoSHA ()
809
815
{
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
-
814
816
testenv_file=" $TESTDIR /testenv/testenv.properties"
817
+
815
818
echo " $TESTDIR /TKG/scripts/getTestenvProperties.sh --repo_dir $1 --output_file $testenv_file --repo_name $2 "
816
819
$TESTDIR /TKG/scripts/getTestenvProperties.sh --repo_dir $1 --output_file $testenv_file --repo_name $2
817
820
}
You can’t perform that action at this time.
0 commit comments