Skip to content

Commit 00e08b1

Browse files
committed
.travis.yml: don't hide compile failure
Fix compile warnings that snuck in while the test was broken.
1 parent d79c395 commit 00e08b1

File tree

6 files changed

+41
-18
lines changed

6 files changed

+41
-18
lines changed

.travis.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ install:
88
- prereqs
99
- '"$EMACS" --version'
1010
script:
11-
- byte-compile
12-
- ert-tests
11+
- folded_call byte-compile
12+
- folded_call ert-tests
1313
- check-recipes
1414
- check-whitespace

el-get-check.el

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,10 @@
2222
(require 'el-get-recipes)
2323
(require 'el-get-build)
2424

25+
(defvar warning-minimum-log-level)
26+
(defvar warning-minimum-level)
27+
(declare-function warning-numeric-level "warnings" (level))
28+
2529
(defvar el-get-check--last-file-or-buffer nil
2630
"The last file-or-buffer checked.")
2731

el-get-core.el

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -227,6 +227,14 @@ entry."
227227
((debug error)
228228
(error "Error reading file %s: %S" filename err))))
229229

230+
(defun el-get-package-is-installed (package)
231+
"Return true if PACKAGE is installed"
232+
(and (file-directory-p (el-get-package-directory package))
233+
(string= "installed"
234+
(el-get-read-package-status package))))
235+
236+
(defalias 'el-get-package-installed-p #'el-get-package-is-installed)
237+
230238

231239
;;
232240
;; Some tools

el-get-dependencies.el

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,16 @@
1616
(require 'el-get-core)
1717
(require 'el-get-recipes)
1818

19+
(eval-and-compile
20+
(unless (fboundp 'string-suffix-p) ; introduced in 24.4
21+
(defun string-suffix-p (suffix string &optional ignore-case)
22+
"Return non-nil if SUFFIX is a suffix of STRING.
23+
If IGNORE-CASE is non-nil, the comparison is done without paying
24+
attention to case differences."
25+
(let ((start-pos (- (length string) (length suffix))))
26+
(and (>= start-pos 0)
27+
(eq t (compare-strings suffix nil nil
28+
string start-pos nil ignore-case)))))))
1929
(defun el-get-dependencies (packages)
2030
"Return the list of packages to install in order."
2131
(multiple-value-bind (plist all-sorted-p non-sorted)
@@ -102,6 +112,9 @@ A `:minimum-emacs-version' property may also be present."
102112
(interactive (list (el-get-read-package-with-status "Auto-get dependencies of" "installed") t))
103113
(unless (el-get-package-installed-p package)
104114
(error "Tried to get Package-Requires of non-installed package, `%s'!" package))
115+
(eval-and-compile
116+
(require 'lisp-mnt) ; `lm-header'
117+
(require 'thingatpt)) ; `read-from-whole-string'
105118
(loop with deps and min-emacs and sub-pkgs
106119
for pdir in (el-get-load-path package)
107120
do (loop for file in (directory-files pdir t "\\.el\\'" t)

el-get.el

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -239,14 +239,6 @@ package names."
239239
(unless (plist-member recipe :type)
240240
(error "el-get: package `%s' has incomplete recipe (no :type)" package))))
241241

242-
(defun el-get-package-is-installed (package)
243-
"Return true if PACKAGE is installed"
244-
(and (file-directory-p (el-get-package-directory package))
245-
(string= "installed"
246-
(el-get-read-package-status package))))
247-
248-
(defalias 'el-get-package-installed-p #'el-get-package-is-installed)
249-
250242
(defun el-get-read-package-name (action &optional filtered)
251243
"Ask user for a package name in minibuffer, with completion.
252244
@@ -589,11 +581,11 @@ PACKAGE may be either a string or the corresponding symbol."
589581

590582
(defun el-get-reload (package &optional package-status-alist)
591583
"Reload PACKAGE."
592-
(declare (advertised-calling-convention (package) "Feb 2015"))
593584
(interactive
594585
(progn
595586
(el-get-clear-status-cache)
596587
(list (el-get-read-package-with-status "Reload" "installed"))))
588+
(declare (advertised-calling-convention (package) "Feb 2015"))
597589
(el-get-verbose-message "el-get-reload: %s" package)
598590
(el-get-with-status-sources ()
599591
(let* ((all-features features)

test/travis-ci.sh

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,12 @@ if [ "$EMACS" = 'emacs-snapshot' ]; then
2121
check-whitespace() { :; }
2222
else
2323
prereqs() {
24-
(mkdir pkg && cd pkg &&
24+
pkg_compat23=https://raw.githubusercontent.com/mirrors/emacs/ba08b24186711eaeb3748f3d1f23e2c2d9ed0d09
25+
ert_compat=https://raw.githubusercontent.com/ohler/ert/c619b56c5bc6a866e33787489545b87d79973205
26+
(mkdir -p pkg && cd pkg &&
2527
curl --silent --show-error --location \
26-
--remote-name https://raw.githubusercontent.com/mirrors/emacs/ba08b24186711eaeb3748f3d1f23e2c2d9ed0d09/lisp/emacs-lisp/package.el \
27-
--remote-name https://raw.githubusercontent.com/ohler/ert/c619b56c5bc6a866e33787489545b87d79973205/lisp/emacs-lisp/ert{,-x}.el)
28+
--remote-name $pkg_compat23/lisp/emacs-lisp/package.el \
29+
--remote-name $ert_compat/lisp/emacs-lisp/ert.el --remote-name $ert_compat/lisp/emacs-lisp/ert-x.el)
2830
}
2931
check-recipes() {
3032
"$EMACS" -Q -L . -batch -l el-get-check -f el-get-check-recipe-batch \
@@ -36,17 +38,21 @@ else
3638
}
3739
fi
3840

41+
folded_call() {
42+
travis_fold start $1
43+
$1
44+
ret=$?
45+
travis_fold end $1
46+
return $ret
47+
}
48+
3949
ert-tests() {
40-
travis_fold start ert-tests
4150
"$EMACS" -batch -Q -L pkg/ -L . -l test/el-get-tests.el -f ert-run-tests-batch-and-exit
42-
travis_fold end ert-tests
4351
}
4452

4553
byte-compile() {
46-
travis_fold start byte-compiling
4754
"$EMACS" -Q -L pkg/ -L . -L methods/ -batch --eval '(setq byte-compile-error-on-warn t)' \
4855
-f batch-byte-compile *.el methods/*.el
49-
travis_fold end byte-compiling
5056
}
5157

5258
# show definitions for log

0 commit comments

Comments
 (0)