[ http://issues.apache.org/jira/browse/DERBY-1746?page=comments#action_12430281 ] Rick Hillegas commented on DERBY-1746: --------------------------------------
I'm afraid I'm a bit confused about what to do with these patches: ---------------- Trunk Patch ----------------------------- After I apply this patch to the trunk, I see the following diffs in the 10_1_10_2 test: 702a703 > ,APP,DERBY655T2,C21_ID,,APP,DERBY655T1,C11_ID,1,3,0,F_12,xxxxGENERATED-IDxxxx,7 707 del < complete caseVersionCheck - passed true 707a708 > complete caseVersionCheck - passed false 1462 del < END - PASS - phase SOFT UPGRADE 1462a1463 > END - FAIL - phase SOFT UPGRADE 2166a2168 > ,APP,DERBY655T2,C21_ID,,APP,DERBY655T1,C11_ID,1,3,0,F_12,xxxxGENERATED-IDxxxx,7 2171 del < complete caseVersionCheck - passed true 2171a2173 > complete caseVersionCheck - passed false 2953 del < END - PASS - phase UPGRADE 2953a2955 > END - FAIL - phase UPGRADE Test Failed. *** End: Upgrade_10_1_10_2 jdk1.4.2_08 2006-08-24 09:12:23 *** I think that the lines beginning with ",APP,DERBY655T2," are new diffs added by this patch. It seems that this patch is making the results dirtier rather than cleaner. In addition, I don't think we should be running a test called 10_1_10_2 in the trunk. We should be running some other tests, perhaps 10_1_to_Current and 10_2_to_Current in the trunk. Perhaps 10_1_10_2 becomes the basis for 10_1_to_Current. --------------- 10.2 Patch -------------------------- Right now 10_1_10_2 runs cleanly in the 10.2 branch. After I apply this patch, I see the following diffs in the 10.2 branch: 702a703 > ,APP,DERBY655T2,C21_ID,,APP,DERBY655T1,C11_ID,1,3,0,F_12,xxxxGENERATED-IDxxxx,7 2166a2168 > ,APP,DERBY655T2,C21_ID,,APP,DERBY655T1,C11_ID,1,3,0,F_12,xxxxGENERATED-IDxxxx,7 Test Failed. *** End: Upgrade_10_1_10_2 jdk1.4.2_08 2006-08-24 09:22:45 *** It seems that some additional steps need to be taken before this patch can be applied to the 10.2 branch. Do we know what those are? > upgrade tests should start using 10.1.3 released builds > ------------------------------------------------------- > > Key: DERBY-1746 > URL: http://issues.apache.org/jira/browse/DERBY-1746 > Project: Derby > Issue Type: Test > Components: Test > Affects Versions: 10.2.1.0 > Reporter: Myrna van Lunteren > Assigned To: Myrna van Lunteren > Priority: Minor > Fix For: 10.2.1.0 > > Attachments: DERBY-1746_102_20060823.diff, > DERBY-1746_102_20060823.stat, DERBY-1746_trunk_20060824.diff > > > The upgrade test' master is based on the 10.1 jars checked in to svn - > 10.1.1.0 - (208786). > However, we now have a newer released version of 10.1 - 10.1.3. This would > be the obvious choice for someone running tests testing the beta jars. > If the jars are 10.1.3 then a diff will occur because of the fix for > DERBY-655: > 703d702 > < > ,APP,DERBY655T2,C21_ID,,APP,DERBY655T1,C11_ID,1,3,0,F_12,xxxxGENERATED-IDxxxx, > 7 > 2168d2166 > < > ,APP,DERBY655T2,C21_ID,,APP,DERBY655T1,C11_ID,1,3,0,F_12,xxxxGENERATED-IDxxxx, > 7 > It would be nice if the final build for 10.2 would include an updgrade test > master created using 10.1.3, And same is true for the trunk. -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.apache.org/jira/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira