Skip to content

Commit 65ae105

Browse files
otiai10otiai10
authored
Merge pull request #183 from otiai10/develop
Develop
2 parents cca9300 + c3cc469 commit 65ae105

File tree

5 files changed

+101
-53
lines changed

5 files changed

+101
-53
lines changed

‎all_test.go

+28-3
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,28 @@ import (
55
"image"
66
"io/ioutil"
77
"os"
8+
"strings"
89
"testing"
910

1011
. "github.com/otiai10/mint"
1112
)
1213

1314
func TestMain(m *testing.M) {
15+
beforeTest()
1416
code := m.Run()
1517
os.Exit(code)
1618
}
1719

20+
func beforeTest() {
21+
if strings.HasPrefix(Version(), "4.") {
22+
os.Setenv("TESS_LSTM_DISABLED", "1")
23+
}
24+
switch os.Getenv("TESTCASE") {
25+
case "archlinux", "centos", "fedora":
26+
os.Setenv("TESS_BOX_DISABLED", "1")
27+
}
28+
}
29+
1830
func TestVersion(t *testing.T) {
1931
version := Version()
2032
Expect(t, version).Match("[0-9]{1}.[0-9]{1,2}(.[0-9a-z_-]*)?")
@@ -194,6 +206,11 @@ func TestClient_ConfigFilePath(t *testing.T) {
194206
}
195207

196208
func TestClientBoundingBox(t *testing.T) {
209+
210+
if os.Getenv("TESS_BOX_DISABLED") == "1" {
211+
t.Skip()
212+
}
213+
197214
client := NewClient()
198215
defer client.Close()
199216
client.SetImage("./test/data/001-helloworld.png")
@@ -220,6 +237,11 @@ func TestClientBoundingBox(t *testing.T) {
220237
}
221238

222239
func TestClient_HTML(t *testing.T) {
240+
241+
if os.Getenv("TESS_BOX_DISABLED") == "1" {
242+
t.Skip()
243+
}
244+
223245
client := NewClient()
224246
defer client.Close()
225247
client.SetImage("./test/data/001-helloworld.png")
@@ -230,6 +252,8 @@ func TestClient_HTML(t *testing.T) {
230252
page := new(Page)
231253
err = xml.Unmarshal([]byte(out), page)
232254
Expect(t, err).ToBe(nil)
255+
Expect(t, len(page.Content.Par.Lines)).ToBe(1)
256+
Expect(t, len(page.Content.Par.Lines[0].Words)).ToBe(2)
233257
Expect(t, page.Content.Par.Lines[0].Words[0].Characters).ToBe("Hello,")
234258
Expect(t, page.Content.Par.Lines[0].Words[1].Characters).ToBe("World!")
235259

@@ -253,7 +277,8 @@ func TestClient_HTML(t *testing.T) {
253277
}
254278

255279
func TestGetAvailableLangs(t *testing.T) {
256-
langs, err := GetAvailableLanguages()
257-
Expect(t, err).ToBe(nil)
258-
Expect(t, len(langs)).ToBe(1) // eng only
280+
t.Skip("TODO")
281+
// langs, err := GetAvailableLanguages()
282+
// Expect(t, err).ToBe(nil)
283+
// Expect(t, len(langs)).ToBe(1) // eng only
259284
}

‎tessbridge.cpp

+1
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@ int Init(TessBaseAPI a, char* tessdataprefix, char* languages, char* configfilep
5959
// {{{ Restore default stderr
6060
(void)freopen("/dev/null", "a", stderr);
6161
dup2(original_stderr, STDERR_FILENO);
62+
close(original_stderr);
6263
setbuf(stderr, NULL);
6364
// }}}
6465

‎test/runtime

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
set -e
44
set -o pipefail
55

6-
PROJDIR=$(dirname $(cd $(dirname ${0}); pwd -P))
6+
PROJDIR=$(dirname "$(cd "$(dirname "${0}")"; pwd -P)")
77

88
# {{{ Help message
99
function help() {
@@ -105,7 +105,7 @@ function test_docker_runtimes() {
105105
docker pull gosseract/test:${testcase} | sed "s/^/│ /"
106106
fi
107107
echo "│ [Docker] Running tests..."
108-
docker run -i -t --rm gosseract/test:${testcase} | sed "s/^/│ [${testcase}] /"
108+
docker run -i -t -e "TESTCASE=${testcase}" --rm gosseract/test:${testcase} | sed "s/^/│ [${testcase}] /"
109109
if [ -n "${PUSH}" ]; then
110110
echo "│ [Docker] Pushing the image..."
111111
docker push gosseract/test:${testcase} | sed "s/^/│ /"

‎test/runtimes/centos.Dockerfile

+68-48
Original file line numberDiff line numberDiff line change
@@ -1,57 +1,77 @@
11
FROM centos:latest
22

3-
RUN yum update -y
4-
RUN yum install -y yum-plugin-ovl epel-release
5-
RUN yum install -y \
6-
golang \
7-
make \
8-
gcc-c++ \
9-
wget \
10-
git \
11-
tar \
12-
autoconf \
13-
automake \
14-
libtool \
15-
libjpeg-devel \
16-
libpng-devel \
17-
libtiff-devel \
18-
libicu-devel \
19-
libpango1.0-dev \
20-
libcairo-dev \
21-
zlib-devel
22-
23-
ENV LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:/usr/local/lib
3+
# RUN yum update -y
4+
RUN dnf install -y 'dnf-command(config-manager)' \
5+
&& dnf config-manager --add-repo \
6+
https://download.opensuse.org/repositories/home:/Alexander_Pozdnyakov/CentOS_8/ \
7+
&& rpm --import \
8+
https://build.opensuse.org/projects/home:Alexander_Pozdnyakov/public_key \
9+
&& dnf install -y \
10+
tesseract-devel \
11+
leptonica-devel \
12+
golang \
13+
git \
14+
gcc-c++
15+
# && dnf install -y tesseract-langpack-deu
16+
# RUN /usr/bin/dnf install -y 'dnf-command(config-manager)'
17+
# RUN dnf config-manager --add-repo https://download.opensuse.org/repositories/home:/Alexander_Pozdnyakov/CentOS_8/
18+
# RUN yum install -y yum-plugin-ovl epel-release
19+
# RUN yum install -y \
20+
# golang \
21+
# make \
22+
# gcc-c++ \
23+
# wget \
24+
# git \
25+
# tar \
26+
# autoconf \
27+
# automake \
28+
# libtool \
29+
# libjpeg-devel \
30+
# libpng-devel \
31+
# libtiff-devel \
32+
# libicu-devel \
33+
# libpango1.0-dev \
34+
# libcairo-dev \
35+
# zlib-devel
36+
37+
# RUN dnf install -y golang git gcc-c++
38+
39+
# ENV LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:/usr/local/lib
40+
# RUN ls -la /usr/local/lib
2441

2542
# Leptonica
26-
RUN mkdir -p /tmp/leptonica \
27-
&& wget -nv https://github.com/DanBloomberg/leptonica/archive/1.74.4.tar.gz \
28-
&& tar -xzf 1.74.4.tar.gz -C /tmp/leptonica \
29-
&& mv /tmp/leptonica/* /leptonica && cd /leptonica && mkdir m4 \
30-
&& autoreconf -i \
31-
&& chmod a+x ./autobuild && ./autobuild \
32-
&& chmod a+x ./configure && ./configure \
33-
&& make && make install
34-
35-
ENV PKG_CONFIG_PATH=/usr/local/lib/pkgconfig
36-
ENV LIBLEPT_HEADERSDIR=/usr/local/include
37-
38-
# Tesseract
39-
RUN mkdir -p /tmp/tesseract \
40-
&& wget -nv https://github.com/tesseract-ocr/tesseract/archive/3.05.02.tar.gz \
41-
&& tar -xzf 3.05.02.tar.gz -C /tmp/tesseract \
42-
&& mv /tmp/tesseract/* /tesseract && cd /tesseract \
43-
&& ./autogen.sh && ./configure \
44-
&& make && make install
45-
46-
ENV TESSDATA_PREFIX=/usr/share/tesseract
47-
RUN mkdir -p ${TESSDATA_PREFIX}/tessdata
48-
RUN wget -nv https://github.com/tesseract-ocr/tessdata/raw/3.04.00/eng.traineddata \
49-
-O ${TESSDATA_PREFIX}/tessdata/eng.traineddata
43+
# RUN mkdir -p /tmp/leptonica \
44+
# && wget -nv https://github.com/DanBloomberg/leptonica/archive/1.74.4.tar.gz \
45+
# && tar -xzf 1.74.4.tar.gz -C /tmp/leptonica \
46+
# && mv /tmp/leptonica/* /leptonica && cd /leptonica && mkdir m4 \
47+
# && autoreconf -i \
48+
# && chmod a+x ./autobuild && ./autobuild \
49+
# && chmod a+x ./configure && ./configure \
50+
# && make && make install
51+
52+
# ENV PKG_CONFIG_PATH=/usr/local/lib/pkgconfig
53+
# ENV LIBLEPT_HEADERSDIR=/usr/local/include
54+
55+
# # Tesseract
56+
# RUN mkdir -p /tmp/tesseract \
57+
# && wget -nv https://github.com/tesseract-ocr/tesseract/archive/3.05.02.tar.gz \
58+
# && tar -xzf 3.05.02.tar.gz -C /tmp/tesseract \
59+
# && mv /tmp/tesseract/* /tesseract && cd /tesseract \
60+
# && ./autogen.sh && ./configure \
61+
# && make && make install
62+
63+
# ENV TESSDATA_PREFIX=/usr/share/tesseract
64+
# RUN mkdir -p ${TESSDATA_PREFIX}/tessdata
65+
# RUN wget -nv https://github.com/tesseract-ocr/tessdata/raw/3.04.00/eng.traineddata \
66+
# -O ${TESSDATA_PREFIX}/tessdata/eng.traineddata
5067

5168
ENV GOPATH=/root/go
52-
# Dependencies for tests
53-
RUN go get github.com/otiai10/mint golang.org/x/net/html
54-
# Mount source code of gosseract project
69+
ENV GO111MODULE=on
70+
# # Dependencies for tests
71+
# RUN go get github.com/otiai10/mint golang.org/x/net/html
72+
# # Mount source code of gosseract project
5573
ADD . ${GOPATH}/src/github.com/otiai10/gosseract
74+
WORKDIR ${GOPATH}/src/github.com/otiai10/gosseract
75+
RUN go get -t -v ./...
5676

5777
CMD ["go", "test", "-v", "github.com/otiai10/gosseract"]

‎test/runtimes/freebsd.Vagrantfile

+2
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@ Vagrant.configure("2") do |config|
1111

1212
config.vm.provision :shell, :inline => '
1313
pkg install -y --quiet tesseract git go
14+
mv /usr/local/share/tessdata/*.traineddata /tmp
15+
mv /tmp/eng.traineddata /usr/local/share/tessdata/
1416
export GOPATH=~/go
1517
go get -t github.com/otiai10/gosseract
1618
'

0 commit comments

Comments
 (0)