Add tests

2 files changed, 46 insertions, 13 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 797fbdb8c11b..2521f1d806b3 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,10 +1,11 @@
 pkgbase = r-callr
 	pkgdesc = Call R from R
 	pkgver = 3.7.0
-	pkgrel = 1
+	pkgrel = 2
 	url = https://cran.r-project.org/package=callr
 	arch = any
 	license = MIT
+	checkdepends = r-testthat
 	depends = r
 	depends = r-processx>=3.5.0
 	depends = r-r6
@@ -14,8 +15,10 @@ pkgbase = r-callr
 	optdepends = r-rprojroot
 	optdepends = r-spelling
 	optdepends = r-testthat
-	optdepends = r-withr
-	source = http://cran.r-project.org/src/contrib/callr_3.7.0.tar.gz
+	optdepends = r-withr>=2.3.0
+	source = https://cran.r-project.org/src/contrib/callr_3.7.0.tar.gz
+	source = CRAN_MIT::https://cran.r-project.org/web/licenses/MIT
 	sha256sums = d67255148595c6d0ba4c4d241bc9f6b5e00cafe25fdc13e38c10acc38653360a
+	sha256sums = e76e4aad5d3d9d606db6f8c460311b6424ebadfce13f5322e9bae9d49cc6090b
 
 pkgname = r-callr
diff --git a/PKGBUILD b/PKGBUILD
index 1b210288c8b7..c0a725ed87de 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,25 +1,55 @@
-# Maintainer: Viktor Drobot (aka dviktor) linux776 [at] gmail [dot] com
-
+# Maintainer: Robert Greener <me@r0bert.dev>
 _cranname=callr
 _cranver=3.7.0
 pkgname=r-${_cranname,,}
 pkgver=${_cranver//[:-]/.}
-pkgrel=1
+pkgrel=2
 pkgdesc="Call R from R"
 arch=(any)
 url="https://cran.r-project.org/package=${_cranname}"
 license=(MIT)
-depends=(r 'r-processx>=3.5.0' r-r6)
-optdepends=(r-cli r-covr r-ps r-rprojroot r-spelling r-testthat r-withr)
-source=("http://cran.r-project.org/src/contrib/${_cranname}_${_cranver}.tar.gz")
-sha256sums=('d67255148595c6d0ba4c4d241bc9f6b5e00cafe25fdc13e38c10acc38653360a')
+depends=(
+	r
+	"r-processx>=3.5.0"
+	r-r6
+)
+checkdepends=(
+	r-testthat
+)
+optdepends=(
+	r-cli
+	r-covr
+	r-ps
+	r-rprojroot
+	r-spelling
+	r-testthat
+	"r-withr>=2.3.0"
+)
+source=("https://cran.r-project.org/src/contrib/${_cranname}_${_cranver}.tar.gz"
+	"CRAN_MIT::https://cran.r-project.org/web/licenses/MIT")
 
 build() {
-  R CMD INSTALL ${_cranname}_${_cranver}.tar.gz -l "${srcdir}"
+	mkdir -p build
+	R CMD INSTALL "${_cranname}" -l "${srcdir}/build"
+}
+
+check() {
+	if [ -d "${_cranname}/tests" ]
+	then
+  		cd "${_cranname}/tests"
+		for i in *.R; do
+			R_LIBS="${srcdir}/build" Rscript --vanilla $i
+		done
+	fi
 }
 
 package() {
-  install -dm0755 "${pkgdir}/usr/lib/R/library"
+	install -dm0755 "${pkgdir}/usr/lib/R/library"
 
-  cp -a --no-preserve=ownership "${_cranname}" "${pkgdir}/usr/lib/R/library"
+	cp -a --no-preserve=ownership "build/${_cranname}" "${pkgdir}/usr/lib/R/library"
+	install -Dm644 CRAN_MIT "${pkgdir}/usr/share/licenses/${pkgname}/MIT"
+	install -Dm644 "${_cranname}/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }
+
+sha256sums=('d67255148595c6d0ba4c4d241bc9f6b5e00cafe25fdc13e38c10acc38653360a'
+            'e76e4aad5d3d9d606db6f8c460311b6424ebadfce13f5322e9bae9d49cc6090b')