From 2b0e9f7787cfb4ab6d0caa387e2e0c88a79d949b Mon Sep 17 00:00:00 2001 From: Thomas Van Lenten Date: Mon, 17 Jul 2023 07:42:29 -0700 Subject: [PATCH] Invoke the pddm validations via bazel PiperOrigin-RevId: 548687354 --- objectivec/DevTools/full_mac_build.sh | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/objectivec/DevTools/full_mac_build.sh b/objectivec/DevTools/full_mac_build.sh index 6350f607ca..861143a924 100755 --- a/objectivec/DevTools/full_mac_build.sh +++ b/objectivec/DevTools/full_mac_build.sh @@ -192,20 +192,8 @@ fi # Ensure the WKT sources checked in are current. objectivec/generate_well_known_types.sh --check-only -header "Checking on the ObjC Runtime Code" -# Some of the kokoro machines don't have python3 yet, so fall back to python if need be. -if hash python3 >/dev/null 2>&1 ; then - LOCAL_PYTHON=python3 -else - LOCAL_PYTHON=python -fi -"${LOCAL_PYTHON}" objectivec/DevTools/pddm_tests.py -if ! "${LOCAL_PYTHON}" objectivec/DevTools/pddm.py --dry-run objectivec/*.[hm] objectivec/Tests/*.[hm] ; then - echo "" - echo "Update by running:" - echo " objectivec/DevTools/pddm.py objectivec/*.[hm] objectivec/Tests/*.[hm]" - exit 1 -fi +header "Checking on the ObjC Runtime pddm expansions" +${BazelBin} test //objectivec:sources_pddm_expansion_test $BazelFlags readonly XCODE_VERSION_LINE="$(xcodebuild -version | grep Xcode\ )" readonly XCODE_VERSION="${XCODE_VERSION_LINE/Xcode /}" # drop the prefix.