Andrew Fenn wrote:
I just submitted a patch to wine patches (Started implementing the xinput library for xbox 360 joystick support ) and I believe patch watcher failed for a few reasons.
- Although it applied my patch it didn't build it as
./tools/make_makefiles isn't called so it isn't built?
I think make_makefiles is called: http://code.google.com/p/winezeug/source/browse/trunk/patchwatcher/patchwatc... Maybe I should make the log more verbose...
- Patch watcher seems to fail because of another patch, perhaps the
latest known good build should be tested if the patch fails and then compared with the first failed attempt?
We don't accumulate patches. There was no other patch active when yours was tested. This was probably just a rare failure of a slightly flaky test. When I verify that tests are flaky, I add them to a blacklist. You just got unlucky, I think. Once you figure out why your patch didn't trigger your stuff to be built, resubmit... - Dan
On Fri, Sep 19, 2008 at 6:27 AM, Dan Kegel dank@kegel.com wrote:
Andrew Fenn wrote:
I just submitted a patch to wine patches (Started implementing the xinput library for xbox 360 joystick support ) and I believe patch watcher failed for a few reasons.
- Although it applied my patch it didn't build it as
./tools/make_makefiles isn't called so it isn't built?
I think make_makefiles is called: http://code.google.com/p/winezeug/source/browse/trunk/patchwatcher/patchwatc... Maybe I should make the log more verbose...
Perhaps it is because of line 122, more specifically "patch -R -p1 < git.diff", because you are using patch when you call make_makefiles my code doesn't get it's makefiles generated. The wiki says you need to add Makefile.in to git before make_makefiles will work correctly?
2008/9/24 Andrew Fenn andrewfenn@gmail.com:
On Fri, Sep 19, 2008 at 6:27 AM, Dan Kegel dank@kegel.com wrote:
Andrew Fenn wrote:
I just submitted a patch to wine patches (Started implementing the xinput library for xbox 360 joystick support ) and I believe patch watcher failed for a few reasons.
- Although it applied my patch it didn't build it as
./tools/make_makefiles isn't called so it isn't built?
I think make_makefiles is called: http://code.google.com/p/winezeug/source/browse/trunk/patchwatcher/patchwatc... Maybe I should make the log more verbose...
Perhaps it is because of line 122, more specifically "patch -R -p1 < git.diff", because you are using patch when you call make_makefiles my code doesn't get it's makefiles generated. The wiki says you need to add Makefile.in to git before make_makefiles will work correctly?
Close, but the make_makefiles invocation that runs on the patch that you send is on line 273. However, as you say, you need to "git add" the Makefile.in before make_makefiles will find it and the script only uses patch to apply the patch: http://code.google.com/p/winezeug/source/browse/trunk/patchwatcher/patchwatc...
Dan, I believe it would fix things if you were to change patchwatcher.sh to use "git apply" instead of patch. It might also be able to guess the p value better for patches generated by diff, CVS and SVN.
Rob Shearman robertshearman@gmail.com wrote:
Dan, I believe it would fix things if you were to change patchwatcher.sh to use "git apply" instead of patch. It might also be able to guess the p value better for patches generated by diff, CVS and SVN.
OK, sounds like a must. Thanks for diagnosing the problem, guys. - Dan
-
Andrew Fenn -
Dan Kegel -
Rob Shearman