The "short one winding, measure primary inductance" method works fine. Just be aware that the leakage inductance you measure isn't the "true" leakage inductance of a given winding, but rather a combination of the leakage inductances on both the primary and secondary.