-
Notifications
You must be signed in to change notification settings - Fork 73
Turn test and build scripts into Makefile targets #245
base: master
Are you sure you want to change the base?
Conversation
Beginnings of a Makefile which provides the following: ``` make app/js/templates.js make all make clean make assert_templates_js_up_to_date ``` Note that I preserved the principle of generating a temporary file with handlebars then moving it into place (which I presume was for atomicity). However the tempfile is now generated by `mktemp` which is safer than using the PID to derive a name. Starts EFForg#227
This reverts commit 75ad162.
Conflicts: sendAppToRouter
Keep the actual scripts for now as almost-empty shells that just call Makefile with the right target.
|
Hi Esteban, This is great ! Thanks. Looks like it will take some more work before getting it merged (Travis CI is failing) and I also want to test it on a clean copy to check it out. Thanks tor getting this going. |
|
There's a dependency issue with the I observe the following output when running |
|
Turns out this is actually an issue w/ |
|
Forked the The test suite seems to pass though it does note quite a few 404s. @emanchado have you observed the same 404s listed in your own output while testing? |
|
@patrickod I do get the 404s using node 0.10.21 and npm 1.3.11, I just never notice them. Or maybe I thought they were normal. In any case, I haven't touched anything related to those tests so I would suggest to merge this patch if it's otherwise fine, and file a separate ticket to investigate if the 404s are a problem. |
|
Ah apologies, forgot to comment last night that the 404 issues are common to the old test scripts. They're not as a result of this PR. Outside of the dependency issue w/ The only caveat are the dependency issues w/ latest npm. I've forked the |
|
I don't really have strong opinions either way (but then again, I'm just a random contributor, not part of the core team or anything). Personally I think it would be kind of nicer for karma-phantomjs-launcher to fix the issue on their side but if they take much longer, working around it sounds better. |
|
There's an issue opened on Github for this which I linked above. The project hasn't been touched since April so it's possibly going to be a while. I'm on this ticket so once I closes I'll happily issue a PR to revert the workaround. On Wed, Sep 17, 2014 at 4:58 AM, Esteban Manchado Velázquez
|
|
This issue is caused by a little bug in your Makefile. The diff --git a/Makefile b/Makefile
index 467a296..aabaece 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
NODEJS=$(if $(shell which nodejs),nodejs,node)
-PIP_USER_SWITCH=$(if $(VIRTUAL_ENV),--user,)
+PIP_USER_SWITCH=$(if $(VIRTUAL_ENV),,--user)
TEMPLATES_JS=app/js/templates.js
HANDLEBARS_FILES=app/templates/*.handlebars # Used to generate templates.jsPS: I've reproduced the error, applied the fix and it worked. |
…lve-conflicts Conflicts: Makefile - Now calls scripts/unit in rule test and uses wildcard. run-tests.sh - Removed modified content.
Merge changes and resolve conflicts.
|
There are several items here that are reasons for caution, or will break things. Defer merge of these makefile related changes until reorg plan to make an openwrt package from this project ( Issue #168 ) takes shape. |
Turn run-tests.sh, run-selenium-tests.sh and build.sh into Makefile targets. The scripts are still there for compatibility, but now they just call "make ".
This is a proposed fix for #227.
As an extra, the "clean" target has improved.