Skip to content

Commit

Permalink
list-utils as test dependency before persistent-soft
Browse files Browse the repository at this point in the history
  • Loading branch information
@rolandwalker
rolandwalker committed Oct 14, 2012
1 parent a85f1f0 commit ea3db15
Show file tree
Hide file tree
Showing 2 changed files with 24 additions and 22 deletions.
44 changes: 23 additions & 21 deletions Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,18 +36,18 @@ TEST_DEP_1_LATEST_URL=https://raw.github.com/emacsmirror/emacs/master/lisp/emacs
TEST_DEP_2=pcache
TEST_DEP_2_STABLE_URL=https://raw.github.com/sigma/pcache/fa8f863546e2e8f2fc0a70f5cc766a7f584e01b6/pcache.el
TEST_DEP_2_LATEST_URL=https://raw.github.com/sigma/pcache/master/pcache.el
TEST_DEP_3=persistent-soft
TEST_DEP_3_STABLE_URL=https://raw.github.com/rolandwalker/persistent-soft/de0d196c94a7d124d0acfa13228648d74cf2315f/persistent-soft.el
TEST_DEP_3_LATEST_URL=https://raw.github.com/rolandwalker/persistent-soft/master/persistent-soft.el
TEST_DEP_4=ucs-utils
TEST_DEP_4_STABLE_URL=https://raw.github.com/rolandwalker/ucs-utils/98578ca47b96c3505a092e40bfb6f4eb253a6827/ucs-utils.el
TEST_DEP_4_LATEST_URL=https://raw.github.com/rolandwalker/ucs-utils/master/ucs-utils.el
TEST_DEP_4a=ucs-utils-6.0-delta
TEST_DEP_4a_STABLE_URL=https://raw.github.com/rolandwalker/ucs-utils/cf38ef555fc30d9aefaf3675ebd969948b71496a/ucs-utils-6.0-delta.el
TEST_DEP_4a_LATEST_URL=https://raw.github.com/rolandwalker/ucs-utils/master/ucs-utils-6.0-delta.el
TEST_DEP_5=list-utils
TEST_DEP_5_STABLE_URL=https://raw.github.com/rolandwalker/list-utils/a34f1d5c0be3faadd76680509e958797a60c0a41/list-utils.el
TEST_DEP_5_LATEST_URL=https://raw.github.com/rolandwalker/list-utils/master/list-utils.el
TEST_DEP_3=list-utils
TEST_DEP_3_STABLE_URL=https://raw.github.com/rolandwalker/list-utils/a34f1d5c0be3faadd76680509e958797a60c0a41/list-utils.el
TEST_DEP_3_LATEST_URL=https://raw.github.com/rolandwalker/list-utils/master/list-utils.el
TEST_DEP_4=persistent-soft
TEST_DEP_4_STABLE_URL=https://raw.github.com/rolandwalker/persistent-soft/de0d196c94a7d124d0acfa13228648d74cf2315f/persistent-soft.el
TEST_DEP_4_LATEST_URL=https://raw.github.com/rolandwalker/persistent-soft/master/persistent-soft.el
TEST_DEP_5=ucs-utils
TEST_DEP_5_STABLE_URL=https://raw.github.com/rolandwalker/ucs-utils/98578ca47b96c3505a092e40bfb6f4eb253a6827/ucs-utils.el
TEST_DEP_5_LATEST_URL=https://raw.github.com/rolandwalker/ucs-utils/master/ucs-utils.el
TEST_DEP_5a=ucs-utils-6.0-delta
TEST_DEP_5a_STABLE_URL=https://raw.github.com/rolandwalker/ucs-utils/cf38ef555fc30d9aefaf3675ebd969948b71496a/ucs-utils-6.0-delta.el
TEST_DEP_5a_LATEST_URL=https://raw.github.com/rolandwalker/ucs-utils/master/ucs-utils-6.0-delta.el
TEST_DEP_6=string-utils
TEST_DEP_6_STABLE_URL=https://raw.github.com/rolandwalker/string-utils/cefb98ecf8257f69d8288929fc0425f145484452/string-utils.el
TEST_DEP_6_LATEST_URL=https://raw.github.com/rolandwalker/string-utils/master/string-utils.el
Expand Down Expand Up @@ -83,8 +83,7 @@ test-dep-3 :
@cd '$(TEST_DIR)' && \
$(RESOLVED_EMACS) $(EMACS_BATCH) -L . -L .. --eval \
"(progn \
(setq package-load-list '(($(TEST_DEP_2) t) \
($(TEST_DEP_3) t))) \
(setq package-load-list '(($(TEST_DEP_3) t))) \
(when (fboundp 'package-initialize) \
(package-initialize)) \
(require '$(TEST_DEP_3)))" || \
Expand All @@ -95,8 +94,8 @@ test-dep-4 :
$(RESOLVED_EMACS) $(EMACS_BATCH) -L . -L .. --eval \
"(progn \
(setq package-load-list '(($(TEST_DEP_2) t) \
($(TEST_DEP_3) t) \
($(TEST_DEP_4) t))) \
($(TEST_DEP_3) t) \
($(TEST_DEP_4) t))) \
(when (fboundp 'package-initialize) \
(package-initialize)) \
(require '$(TEST_DEP_4)))" || \
Expand All @@ -106,7 +105,10 @@ test-dep-5 :
@cd '$(TEST_DIR)' && \
$(RESOLVED_EMACS) $(EMACS_BATCH) -L . -L .. --eval \
"(progn \
(setq package-load-list '(($(TEST_DEP_5) t))) \
(setq package-load-list '(($(TEST_DEP_2) t) \
($(TEST_DEP_3) t) \
($(TEST_DEP_4) t) \
($(TEST_DEP_5) t))) \
(when (fboundp 'package-initialize) \
(package-initialize)) \
(require '$(TEST_DEP_5)))" || \
Expand All @@ -116,7 +118,7 @@ test-dep-6 :
@cd '$(TEST_DIR)' && \
$(RESOLVED_EMACS) $(EMACS_BATCH) -L . -L .. --eval \
"(progn \
(setq package-load-list '(($(TEST_DEP_5) t) \
(setq package-load-list '(($(TEST_DEP_3) t) \
($(TEST_DEP_6) t))) \
(when (fboundp 'package-initialize) \
(package-initialize)) \
Expand All @@ -128,17 +130,17 @@ downloads :
$(CURL) '$(TEST_DEP_2_STABLE_URL)' > '$(TEST_DIR)/$(TEST_DEP_2).el'
$(CURL) '$(TEST_DEP_3_STABLE_URL)' > '$(TEST_DIR)/$(TEST_DEP_3).el'
$(CURL) '$(TEST_DEP_4_STABLE_URL)' > '$(TEST_DIR)/$(TEST_DEP_4).el'
$(CURL) '$(TEST_DEP_4a_STABLE_URL)' > '$(TEST_DIR)/$(TEST_DEP_4a).el'
$(CURL) '$(TEST_DEP_5_STABLE_URL)' > '$(TEST_DIR)/$(TEST_DEP_5).el'
$(CURL) '$(TEST_DEP_5a_STABLE_URL)' > '$(TEST_DIR)/$(TEST_DEP_5a).el'
$(CURL) '$(TEST_DEP_6_STABLE_URL)' > '$(TEST_DIR)/$(TEST_DEP_6).el'

downloads-latest :
$(CURL) '$(TEST_DEP_1_LATEST_URL)' > '$(TEST_DIR)/$(TEST_DEP_1).el'
$(CURL) '$(TEST_DEP_2_LATEST_URL)' > '$(TEST_DIR)/$(TEST_DEP_2).el'
$(CURL) '$(TEST_DEP_3_LATEST_URL)' > '$(TEST_DIR)/$(TEST_DEP_3).el'
$(CURL) '$(TEST_DEP_4_LATEST_URL)' > '$(TEST_DIR)/$(TEST_DEP_4).el'
$(CURL) '$(TEST_DEP_4a_LATEST_URL)' > '$(TEST_DIR)/$(TEST_DEP_4a).el'
$(CURL) '$(TEST_DEP_5_LATEST_URL)' > '$(TEST_DIR)/$(TEST_DEP_5).el'
$(CURL) '$(TEST_DEP_5a_LATEST_URL)' > '$(TEST_DIR)/$(TEST_DEP_5a).el'
$(CURL) '$(TEST_DEP_6_LATEST_URL)' > '$(TEST_DIR)/$(TEST_DEP_6).el'

autoloads :
Expand Down Expand Up @@ -225,7 +227,7 @@ run-pristine-local :
clean :
@rm -f '$(AUTOLOADS_FILE)' *.elc *~ */*.elc */*~ && \
cd '$(TEST_DIR)' && \
rm -f './$(TEST_DEP_1).el' './$(TEST_DEP_2).el' './$(TEST_DEP_3).el' './$(TEST_DEP_4).el' './$(TEST_DEP_4a).el' \
rm -f './$(TEST_DEP_1).el' './$(TEST_DEP_2).el' './$(TEST_DEP_3).el' './$(TEST_DEP_4).el' './$(TEST_DEP_5a).el' \
'./$(TEST_DEP_5).el' './$(TEST_DEP_6).el' './$(TEST_DEP_7).el' './$(TEST_DEP_8).el' './$(TEST_DEP_9).el' && \
if test -n '$(TEST_DATADIR)'; then rm -rf './$(TEST_DATADIR)'; fi

Expand Down
2 changes: 1 addition & 1 deletion ert-tests/unicode-enbox-test.el
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@
(when (fboundp 'package-initialize)
(package-initialize)))

(require 'list-utils)
(require 'persistent-soft)
(require 'ucs-utils)
(require 'list-utils)
(require 'string-utils)
(require 'unicode-enbox)

Expand Down

0 comments on commit ea3db15

Please sign in to comment.