Skip to content

Commit c38342f

Browse files
nehebneheb
committed
reenable stdin
Signed-off-by: Rosen Penev <[email protected]>
1 parent 58483b0 commit c38342f

File tree

3 files changed

+51
-50
lines changed

3 files changed

+51
-50
lines changed

‎.github/workflows/on_PR_meson.yaml‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
with:
2121
version: ${{matrix.cxx}}
2222
- name: Install meson
23-
run: python3 -m pip install meson ninja
23+
run: python3 -m pip install lxml meson ninja
2424
- name: Install dependencies
2525
run: sudo apt install -y cmake libcurl4-openssl-dev libbrotli-dev libexpat-dev libfmt-dev libinih-dev libz-dev gettext
2626
- name: Compile and Test
@@ -42,7 +42,7 @@ jobs:
4242
version: ${{matrix.cxx}}
4343
- name: Install meson
4444
run: |
45-
python3 -m pip install meson ninja
45+
python3 -m pip install lxml meson ninja
4646
- name: Install dependencies
4747
run: |
4848
sudo apt install -y libcurl4-openssl-dev libbrotli-dev libz-dev gettext
@@ -66,7 +66,7 @@ jobs:
6666

6767
- name: Install packages
6868
run: |
69-
python -m pip install meson ninja
69+
python -m pip install lxml meson ninja
7070
7171
- uses: ilammy/msvc-dev-cmd@v1
7272
with:
@@ -88,7 +88,7 @@ jobs:
8888

8989
- name: Install packages
9090
run: |
91-
python -m pip install meson ninja
91+
python -m pip install lxml meson ninja
9292
9393
- uses: ilammy/msvc-dev-cmd@v1
9494

@@ -130,6 +130,7 @@ jobs:
130130
meson:p
131131
ninja:p
132132
pkgconf:p
133+
python-lxml:p
133134
134135
- name: Compile and Test
135136
run: |
@@ -169,6 +170,7 @@ jobs:
169170
- name: Install packages
170171
run: |
171172
brew install inih meson
173+
python -m pip install lxml
172174
173175
- name: Compile and Test
174176
run: |

‎test/data/test_reference_files/stdin-test.out‎

Lines changed: 45 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
STRUCTURE OF JPEG FILE: girl.jpg
22
address | marker | length | data
33
0 | 0xffd8 SOI
4-
2 | 0xffe0 APP0 | 16 | JFIF............
4+
2 | 0xffe0 APP0 | 16 | JFIF.........
55
20 | 0xffdb DQT | 67
66
89 | 0xffdb DQT | 67
77
158 | 0xffc0 SOF0 | 17
@@ -15,7 +15,7 @@ STRUCTURE OF JPEG FILE: girl.jpg
1515
STRUCTURE OF JPEG FILE: girl.jpg
1616
address | marker | length | data
1717
0 | 0xffd8 SOI
18-
2 | 0xffe0 APP0 | 16 | JFIF............
18+
2 | 0xffe0 APP0 | 16 | JFIF.........
1919
20 | 0xffdb DQT | 67
2020
89 | 0xffdb DQT | 67
2121
158 | 0xffc0 SOF0 | 17
@@ -28,7 +28,7 @@ STRUCTURE OF JPEG FILE: girl.jpg
2828
STRUCTURE OF JPEG FILE: girl.jpg
2929
address | marker | length | data
3030
0 | 0xffd8 SOI
31-
2 | 0xffe0 APP0 | 16 | JFIF............
31+
2 | 0xffe0 APP0 | 16 | JFIF.........
3232
20 | 0xffe1 APP1 | 4613 | http://ns.adobe.com/xap/1.0/.<?x
3333
4635 | 0xffdb DQT | 67
3434
4704 | 0xffdb DQT | 67
@@ -41,7 +41,7 @@ STRUCTURE OF JPEG FILE: girl.jpg
4141
STRUCTURE OF JPEG FILE: girl.jpg
4242
address | marker | length | data
4343
0 | 0xffd8 SOI
44-
2 | 0xffe0 APP0 | 16 | JFIF............
44+
2 | 0xffe0 APP0 | 16 | JFIF.........
4545
20 | 0xffdb DQT | 67
4646
89 | 0xffdb DQT | 67
4747
158 | 0xffc0 SOF0 | 17
@@ -53,7 +53,7 @@ STRUCTURE OF JPEG FILE: girl.jpg
5353
STRUCTURE OF JPEG FILE: girl.jpg
5454
address | marker | length | data
5555
0 | 0xffd8 SOI
56-
2 | 0xffe0 APP0 | 16 | JFIF............
56+
2 | 0xffe0 APP0 | 16 | JFIF.........
5757
20 | 0xffe1 APP1 | 4613 | http://ns.adobe.com/xap/1.0/.<?x
5858
4635 | 0xffdb DQT | 67
5959
4704 | 0xffdb DQT | 67
@@ -108,7 +108,7 @@ STRUCTURE OF JPEG FILE: girl.jpg
108108
STRUCTURE OF JPEG FILE: girl.jpg
109109
address | marker | length | data
110110
0 | 0xffd8 SOI
111-
2 | 0xffe0 APP0 | 16 | JFIF............
111+
2 | 0xffe0 APP0 | 16 | JFIF.........
112112
20 | 0xffdb DQT | 67
113113
89 | 0xffdb DQT | 67
114114
158 | 0xffc0 SOF0 | 17
@@ -122,23 +122,23 @@ STRUCTURE OF JPEG FILE: girl.jpg
122122
STRUCTURE OF JPEG FILE: girl.jpg
123123
address | marker | length | data
124124
0 | 0xffd8 SOI
125-
2 | 0xffe0 APP0 | 16 | JFIF............
125+
2 | 0xffe0 APP0 | 16 | JFIF.........
126126
20 | 0xffe1 APP1 | 5704 | Exif..II*......................
127127
5726 | 0xffe1 APP1 | 5287 | http://ns.adobe.com/xap/1.0/.<?x
128-
11015 | 0xffed APP13 | 788 | Photoshop 3.0.8BIM..........Z...
129-
11805 | 0xffdb DQT | 67
130-
11874 | 0xffdb DQT | 67
131-
11943 | 0xffc0 SOF0 | 17
132-
11962 | 0xffc4 DHT | 28
133-
11992 | 0xffc4 DHT | 74
134-
12068 | 0xffc4 DHT | 28
135-
12098 | 0xffc4 DHT | 57
136-
12157 | 0xffe1 APP1 | 4602 | http://ns.adobe.com/xap/1.0/.<?x
137-
16761 | 0xffda SOS
128+
11015 | 0xffed APP13 | 784 | Photoshop 3.0.8BIM..........Z...
129+
11801 | 0xffdb DQT | 67
130+
11870 | 0xffdb DQT | 67
131+
11939 | 0xffc0 SOF0 | 17
132+
11958 | 0xffc4 DHT | 28
133+
11988 | 0xffc4 DHT | 74
134+
12064 | 0xffc4 DHT | 28
135+
12094 | 0xffc4 DHT | 57
136+
12153 | 0xffe1 APP1 | 4602 | http://ns.adobe.com/xap/1.0/.<?x
137+
16757 | 0xffda SOS
138138
STRUCTURE OF JPEG FILE: girl.jpg
139139
address | marker | length | data
140140
0 | 0xffd8 SOI
141-
2 | 0xffe0 APP0 | 16 | JFIF............
141+
2 | 0xffe0 APP0 | 16 | JFIF.........
142142
20 | 0xffdb DQT | 67
143143
89 | 0xffdb DQT | 67
144144
158 | 0xffc0 SOF0 | 17
@@ -152,27 +152,27 @@ STRUCTURE OF JPEG FILE: girl.jpg
152152
STRUCTURE OF JPEG FILE: girl.jpg
153153
address | marker | length | data
154154
0 | 0xffd8 SOI
155-
2 | 0xffe0 APP0 | 16 | JFIF............
155+
2 | 0xffe0 APP0 | 16 | JFIF.........
156156
20 | 0xffe1 APP1 | 8528 | Exif..II*......................
157157
8550 | 0xffe1 APP1 | 6730 | http://ns.adobe.com/xap/1.0/.<?x
158-
15282 | 0xffed APP13 | 794 | Photoshop 3.0.8BIM..........Z...
159-
16078 | 0xffdb DQT | 67
160-
16147 | 0xffdb DQT | 67
161-
16216 | 0xffc0 SOF0 | 17
162-
16235 | 0xffc4 DHT | 28
163-
16265 | 0xffc4 DHT | 74
164-
16341 | 0xffc4 DHT | 28
165-
16371 | 0xffc4 DHT | 57
166-
16430 | 0xffe1 APP1 | 4602 | http://ns.adobe.com/xap/1.0/.<?x
167-
21034 | 0xffda SOS
158+
15282 | 0xffed APP13 | 788 | Photoshop 3.0.8BIM..........Z...
159+
16072 | 0xffdb DQT | 67
160+
16141 | 0xffdb DQT | 67
161+
16210 | 0xffc0 SOF0 | 17
162+
16229 | 0xffc4 DHT | 28
163+
16259 | 0xffc4 DHT | 74
164+
16335 | 0xffc4 DHT | 28
165+
16365 | 0xffc4 DHT | 57
166+
16424 | 0xffe1 APP1 | 4602 | http://ns.adobe.com/xap/1.0/.<?x
167+
21028 | 0xffda SOS
168168
STRUCTURE OF JPEG FILE: Reagan.jpg
169169
address | marker | length | data
170170
0 | 0xffd8 SOI
171171
2 | 0xffe1 APP1 | 5704 | Exif..MM.*......................
172172
5708 | 0xffe1 APP1 | 5287 | http://ns.adobe.com/xap/1.0/.<?x
173173
10997 | 0xffe2 APP2 | 3160 | ICC_PROFILE......HLino....mntrRG chunk 1/1
174174
14159 | 0xffed APP13 | 3030 | Photoshop 3.0.8BIM..........Z...
175-
17191 | 0xffee APP14 | 14 | Adobe.d@......
175+
17191 | 0xffee APP14 | 14 | Adobe.d@....
176176
17207 | 0xffdb DQT | 132
177177
17341 | 0xffc0 SOF0 | 17
178178
17360 | 0xffdd DRI | 4
@@ -181,21 +181,21 @@ STRUCTURE OF JPEG FILE: Reagan.jpg
181181
STRUCTURE OF PNG FILE: ReaganSmallPng.png
182182
address | chunk | length | data | checksum
183183
8 | IHDR | 13 | ............ | 0x8cf910c3
184-
33 | zTXt | 8648 | Raw profile type exif..x...Wv$ | 0xca41f34d
185-
8693 | zTXt | 632 | Raw profile type iptc..x..T[.. | 0xa2860459
186-
9337 | iCCP | 2598 | ..x...wTS.....7.P.....khR.H..H | 0x915a222e
187-
11947 | iTXt | 7117 | XML:com.adobe.xmp.....<?xpacke | 0x2ff025b8
188-
19076 | gAMA | 4 | .... | 0x0bfc6105
189-
19092 | bKGD | 6 | ...... | 0xa0bda793
190-
19110 | pHYs | 9 | ...#...#. | 0x78a53f76
191-
19131 | tIME | 7 | ......# | 0xdf7f5bbd
192-
19150 | zTXt | 278 | Comment..x.}[email protected].. | 0xdb1dfff5
193-
19440 | IDAT | 8192 | x...i.$.u%v....Gdd...U..X.`0.9 | 0x96dc2ed9
194-
27644 | IDAT | 8192 | df.."..1L...0...j....`F.&.yf.. | 0xbfeb3575
195-
35848 | IDAT | 8192 | K-N.t.ENL.R..q](jm...sN..U.+.. | 0xe249a922
196-
44052 | IDAT | 8192 | >..?.Nw..iN......xE....z..[..} | 0x054b9d1e
197-
52256 | IDAT | 7066 | ...q.B...2*@..#....T....h..v.. | 0x327f1e3e
198-
59334 | IEND | 0 | | 0xae426082
184+
33 | eXIf | 8520 | II*.......................... | 0x479a6662
185+
8565 | zTXt | 630 | Raw profile type iptc..x..T... | 0xa492403c
186+
9207 | iCCP | 2593 | ..x...wTS.....7.&....!...@.... | 0x56151192
187+
11812 | iTXt | 7117 | XML:com.adobe.xmp.....<?xpacke | 0x2ff025b8
188+
18941 | gAMA | 4 | .... | 0x0bfc6105
189+
18957 | bKGD | 6 | ...... | 0xa0bda793
190+
18975 | pHYs | 9 | ...#...#. | 0x78a53f76
191+
18996 | tIME | 7 | ......# | 0xdf7f5bbd
192+
19015 | zTXt | 278 | Comment..x.}[email protected].. | 0xdb1dfff5
193+
19305 | IDAT | 8192 | x...i.$.u%v....Gdd...U..X.`0.9 | 0x96dc2ed9
194+
27509 | IDAT | 8192 | df.."..1L...0...j....`F.&.yf.. | 0xbfeb3575
195+
35713 | IDAT | 8192 | K-N.t.ENL.R..q](jm...sN..U.+.. | 0xe249a922
196+
43917 | IDAT | 8192 | >..?.Nw..iN......xE....z..[..} | 0x054b9d1e
197+
52121 | IDAT | 7066 | ...q.B...2*@..#....T....h..v.. | 0x327f1e3e
198+
59199 | IEND | 0 | | 0xae426082
199199
STRUCTURE OF WEBP FILE: exiv2-bug1199.webp
200200
Chunk | Length | Offset | Payload
201201
RIFF | 190110 | 0 | WEBP

‎tests/bash_tests/testcases.py‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1010,7 +1010,6 @@ def preview_test(self):
10101010

10111011

10121012
def stdin_test(self):
1013-
return # temporarily disable
10141013
# Test driver for stdin
10151014
if find_spec('lxml') is None:
10161015
print('Skipped. Because it misses module lxml. Please install: `pip install lxml`')

0 commit comments

Comments
 (0)