{"thread":{"id":"20758","subject":"[PATCH jh/cvs-helper 2/2] t/test-lib.sh: don't perform python preparations when NO_PYTHON is set","startedAt":"2009-08-27T16:24:22Z","lastAt":"2009-08-27T21:46:13Z","messageCount":5,"participants":["Brandon Casey","Johan Herland","Junio C Hamano"],"isPatch":true,"patchVersion":1,"patchTotal":2},"messages":[{"id":"121878","messageId":"Rxz2NOwzg1UZ0TgAtOhrA7e8wE02XwcSzNC9cc1EL_W_oN1BjtZn8ClmG5zKB_DKmTgVP0PlMYI@cipher.nrlssc.navy.mil","threadId":"20758","inReplyTo":null,"subject":"[PATCH jh/cvs-helper 0/2] Fix building when python is not available","fromName":"Brandon Casey","fromEmail":"casey@nrlssc.navy.mil","sentAt":"2009-08-27T16:24:22Z","receivedAt":"2009-08-27T16:24:22Z","isPatch":true,"sender":{"key":"drafnel@gmail.com","avatar":"https://avatars.githubusercontent.com/u/921167?v=4"},"body":"These two are built on top of pu. I'm pretty sure jh/cvs-helper is\nthe relevant branch.\n\nBrandon Casey (2):\n Makefile: write NO_PYTHON setting to GIT-BUILD-OPTIONS file\n t/test-lib.sh: don't perform python preparations when NO_PYTHON is\n set\n\n Makefile | 1 +\n t/test-lib.sh | 18 +++++++++---------\n 2 files changed, 10 insertions(+), 9 deletions(-)\n"},{"id":"121879","messageId":"Rxz2NOwzg1UZ0TgAtOhrA7dGx1obNszSQLoUJ4IoUGJk5ekFKeKU4vpg535nyOx20P_IWNiudJo@cipher.nrlssc.navy.mil","threadId":"20758","inReplyTo":"Rxz2NOwzg1UZ0TgAtOhrA7e8wE02XwcSzNC9cc1EL_W_oN1BjtZn8ClmG5zKB_DKmTgVP0PlMYI@cipher.nrlssc.navy.mil","subject":"[PATCH jh/cvs-helper 1/2] Makefile: write NO_PYTHON setting to GIT-BUILD-OPTIONS file","fromName":"Brandon Casey","fromEmail":"casey@nrlssc.navy.mil","sentAt":"2009-08-27T16:24:23Z","receivedAt":"2009-08-27T16:24:23Z","isPatch":true,"sender":{"key":"drafnel@gmail.com","avatar":"https://avatars.githubusercontent.com/u/921167?v=4"},"body":"From: Brandon Casey \n\nThe GIT-BUILD-OPTIONS file is sourced by the t/test-lib.sh script which\nprepares the environment for the test suite. It is used to communicate\nthe user's settings for things like SHELL_PATH, TAR, NO_CURL, and NO_PERL.\nAdd NO_PYTHON so this setting will be available to the test suite.\n\nSigned-off-by: Brandon Casey \n---\n Makefile | 1 +\n 1 files changed, 1 insertions(+), 0 deletions(-)\n\ndiff --git a/Makefile b/Makefile\nindex 128c308..5c1ae7b 100644\n--- a/Makefile\n+++ b/Makefile\n@@ -1615,6 +1615,7 @@ GIT-BUILD-OPTIONS: .FORCE-GIT-BUILD-OPTIONS\n \t@echo TAR=\\''$(subst ','\\'',$(subst ','\\'',$(TAR)))'\\' >>$@\n \t@echo NO_CURL=\\''$(subst ','\\'',$(subst ','\\'',$(NO_CURL)))'\\' >>$@\n \t@echo NO_PERL=\\''$(subst ','\\'',$(subst ','\\'',$(NO_PERL)))'\\' >>$@\n+\t@echo NO_PYTHON=\\''$(subst ','\\'',$(subst ','\\'',$(NO_PYTHON)))'\\' >>$@\n \n ### Detect Tck/Tk interpreter path changes\n ifndef NO_TCLTK\n-- \n1.6.4\n"},{"id":"121877","messageId":"Rxz2NOwzg1UZ0TgAtOhrAzUAMAnO9FMOUVyBSREU0jlWw8GgmyUyfh_Kw3hSgy17_1U6jTxx7pE@cipher.nrlssc.navy.mil","threadId":"20758","inReplyTo":"Rxz2NOwzg1UZ0TgAtOhrA7dGx1obNszSQLoUJ4IoUGJk5ekFKeKU4vpg535nyOx20P_IWNiudJo@cipher.nrlssc.navy.mil","subject":"[PATCH jh/cvs-helper 2/2] t/test-lib.sh: don't perform python preparations when NO_PYTHON is set","fromName":"Brandon Casey","fromEmail":"casey@nrlssc.navy.mil","sentAt":"2009-08-27T16:24:24Z","receivedAt":"2009-08-27T16:24:24Z","isPatch":true,"sender":{"key":"drafnel@gmail.com","avatar":"https://avatars.githubusercontent.com/u/921167?v=4"},"body":"From: Brandon Casey \n\nWhen setting GITPYTHONLIB, a check is performed to test whether the path\nthat GITPYTHONLIB is set to is a valid directory. This test always fails\nwhen NO_PYTHON is set since git_remote_cvs is not built. So add a test\non NO_PYTHON to the conditional that protects this section.\n\nAdditionally, move this section down so it is done _after_\nGIT-BUILD-OPTIONS is sourced, so that the NO_PYTHON setting is available.\n\nSigned-off-by: Brandon Casey \n---\n t/test-lib.sh | 18 +++++++++---------\n 1 files changed, 9 insertions(+), 9 deletions(-)\n\ndiff --git a/t/test-lib.sh b/t/test-lib.sh\nindex a7fbfef..d95c66b 100644\n--- a/t/test-lib.sh\n+++ b/t/test-lib.sh\n@@ -638,15 +638,6 @@ test -d ../templates/blt || {\n \terror \"You haven't built things yet, have you?\"\n }\n \n-if test -z \"$GIT_TEST_INSTALLED\"\n-then\n-\tGITPYTHONLIB=\"$(pwd)/../git_remote_cvs/build/lib\"\n-\texport GITPYTHONLIB\n-\ttest -d ../git_remote_cvs/build || {\n-\t\terror \"You haven't built git_remote_cvs yet, have you?\"\n-\t}\n-fi\n-\n if ! test -x ../test-chmtime; then\n \techo >&2 'You need to build test-chmtime:'\n \techo >&2 'Run \"make test-chmtime\" in the source (toplevel) directory'\n@@ -655,6 +646,15 @@ fi\n \n . ../GIT-BUILD-OPTIONS\n \n+if test -z \"$NO_PYTHON\" -a -z \"$GIT_TEST_INSTALLED\"\n+then\n+\tGITPYTHONLIB=\"$(pwd)/../git_remote_cvs/build/lib\"\n+\texport GITPYTHONLIB\n+\ttest -d ../git_remote_cvs/build || {\n+\t\terror \"You haven't built git_remote_cvs yet, have you?\"\n+\t}\n+fi\n+\n # Test repository\n test=\"trash directory.$(basename \"$0\" .sh)\"\n test -n \"$root\" && test=\"$root/$test\"\n-- \n1.6.4\n"},{"id":"121883","messageId":"200908271857.47035.johan@herland.net","threadId":"20758","inReplyTo":"Rxz2NOwzg1UZ0TgAtOhrA7e8wE02XwcSzNC9cc1EL_W_oN1BjtZn8ClmG5zKB_DKmTgVP0PlMYI@cipher.nrlssc.navy.mil","subject":"Re: [PATCH jh/cvs-helper 0/2] Fix building when python is not available","fromName":"Johan Herland","fromEmail":"johan@herland.net","sentAt":"2009-08-27T16:57:46Z","receivedAt":"2009-08-27T16:57:46Z","isPatch":true,"sender":{"key":"johan@herland.net","avatar":"https://avatars.githubusercontent.com/u/547031?v=4"},"body":"On Thursday 27 August 2009, Brandon Casey wrote:\n> These two are built on top of pu. I'm pretty sure jh/cvs-helper is\n> the relevant branch.\n>\n> Brandon Casey (2):\n> Makefile: write NO_PYTHON setting to GIT-BUILD-OPTIONS file\n> t/test-lib.sh: don't perform python preparations when NO_PYTHON is\n> set\n\nThanks. Both are\n\nAcked-by: Johan Herland \n\nI'll fold these into the next iteration of jh/cvs-helper.\n\n\nHave fun! :)\n\n...Johan\n\n\n-- \nJohan Herland, \nwww.herland.net\n"},{"id":"121924","messageId":"7v3a7dorq2.fsf@alter.siamese.dyndns.org","threadId":"20758","inReplyTo":"200908271857.47035.johan@herland.net","subject":"Re: [PATCH jh/cvs-helper 0/2] Fix building when python is not available","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2009-08-27T21:46:13Z","receivedAt":"2009-08-27T21:46:13Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Johan Herland writes:\n\n> Thanks. Both are\n>\n> Acked-by: Johan Herland \n>\n> I'll fold these into the next iteration of jh/cvs-helper.\n\nThanks, both. Then I'll ignore this thread and simply wait for the next\nround from you.\n"}]}