Skip to content

Commit 286a445

Browse files
committed
Merge branch 'master' of jsoftware.com:jsource
purge obsolete code, fix J32 compile errors
2 parents 1bc8658 + ced30ff commit 286a445

File tree

2 files changed

+31
-20
lines changed

2 files changed

+31
-20
lines changed

.github/workflows/jsource.yml

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -149,13 +149,13 @@ jobs:
149149
CC: clang
150150
USE_SLEEF: 1
151151
USE_OPENMP: 0
152-
_MEMAUDIT: 127
152+
_MEMAUDIT: 44
153153
run: |
154154
script/buildga.sh linux || exit 1
155155
156156
- name: Test JE (Linux memaudit)
157157
env:
158-
_MEMAUDIT: 127
158+
_MEMAUDIT: 44
159159
run: |
160160
script/testga.sh linux || exit 1
161161
ls -l j64
@@ -343,13 +343,13 @@ jobs:
343343
CC: clang
344344
USE_SLEEF: 1
345345
USE_OPENMP: 0
346-
_MEMAUDIT: 127
346+
_MEMAUDIT: 44
347347
run: |
348348
script/buildga.sh darwin || exit 1
349349
350350
- name: Test JE (macOS memaudit)
351351
env:
352-
_MEMAUDIT: 127
352+
_MEMAUDIT: 44
353353
run: |
354354
script/testga.sh darwin || exit 1
355355
cd j64
@@ -396,13 +396,13 @@ jobs:
396396
CC: clang
397397
USE_SLEEF: 1
398398
USE_OPENMP: 0
399-
_MEMAUDIT: 127
399+
_MEMAUDIT: 44
400400
run: |
401401
script/buildga.sh darwin || exit 1
402402
403403
- name: Test JE (macOS arm64 memaudit)
404404
env:
405-
_MEMAUDIT: 127
405+
_MEMAUDIT: 44
406406
run: |
407407
script/testga.sh darwin || exit 1
408408
cd j64
@@ -590,13 +590,13 @@ jobs:
590590
CC: clang
591591
USE_SLEEF: 1
592592
USE_OPENMP: 0
593-
_MEMAUDIT: 127
593+
_MEMAUDIT: 44
594594
run: |
595595
script/buildga.sh raspberry arm64 || exit 1
596596
597597
- name: Test JE (Linux arm64 memaudit)
598598
env:
599-
_MEMAUDIT: 127
599+
_MEMAUDIT: 44
600600
run: |
601601
script/testga.sh raspberry arm64 || exit 1
602602
cd j64
@@ -693,13 +693,13 @@ jobs:
693693
USE_SLEEF: 1
694694
USE_SLEEFQUAD: 1
695695
USE_OPENMP: 0
696-
_MEMAUDIT: 127
696+
_MEMAUDIT: 44
697697
run: |
698698
script/buildga.sh raspberry armv6l || exit 1
699699
700700
- name: Test JE (Linux arm32 memaudit)
701701
env:
702-
_MEMAUDIT: 127
702+
_MEMAUDIT: 44
703703
run: |
704704
script/testga.sh raspberry armv6l || exit 1
705705
cd j32
@@ -1555,7 +1555,7 @@ jobs:
15551555
CC: emcc
15561556
USE_SLEEF: 1
15571557
USE_OPENMP: 0
1558-
_MEMAUDIT: 127
1558+
_MEMAUDIT: 44
15591559
run: |
15601560
script/buildga.sh wasm || exit 1
15611561
script/testga.sh wasm || exit 1
@@ -1632,14 +1632,14 @@ jobs:
16321632
- name: Build JE (Windows memaudit)
16331633
shell: cmd
16341634
env:
1635-
_MEMAUDIT: 127
1635+
_MEMAUDIT: 44
16361636
run: |
16371637
script\buildga.cmd x64
16381638
16391639
- name: Test JE (Windows memaudit)
16401640
shell: cmd
16411641
env:
1642-
_MEMAUDIT: 127
1642+
_MEMAUDIT: 44
16431643
run: |
16441644
script\testga.cmd x64
16451645
@@ -1722,14 +1722,14 @@ jobs:
17221722
- name: Build JE (Windows 32 memaudit)
17231723
shell: cmd
17241724
env:
1725-
_MEMAUDIT: 127
1725+
_MEMAUDIT: 44
17261726
run: |
17271727
script\buildga.cmd x86
17281728
17291729
- name: Test JE (Windows 32 memaudit)
17301730
shell: cmd
17311731
env:
1732-
_MEMAUDIT: 127
1732+
_MEMAUDIT: 44
17331733
run: |
17341734
script\testga.cmd x86
17351735
@@ -1857,14 +1857,14 @@ jobs:
18571857
- name: Build JE (Windows arm64 memaudit)
18581858
shell: cmd
18591859
env:
1860-
_MEMAUDIT: 127
1860+
_MEMAUDIT: 44
18611861
run: |
18621862
script\buildga.cmd arm64
18631863
18641864
- name: Test JE (Windows arm64 memaudit)
18651865
shell: cmd
18661866
env:
1867-
_MEMAUDIT: 127
1867+
_MEMAUDIT: 44
18681868
run: |
18691869
script\testga.cmd arm64
18701870

test/tsu.ijs

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,22 +57,27 @@ blacklist=: blacklist, IFIOS#(<testpath),each <'gipht.ijs' NB. crash if include
5757
blacklist=: blacklist, (IFRASPI+.'OpenBSD'-:UNAME)#(<testpath),each <'g128x14.ijs' NB. raspberry crash; OpenBSD fail
5858

5959
NB. too slow
60-
blacklist=: blacklist, '' ] (0~:9!:56'MEMAUDIT')#(<testpath),each <@(,&'.ijs');._2 [ 0 : 0
60+
blacklist=: blacklist, '' [ (0~:9!:56'MEMAUDIT')#(<testpath),each <@(,&'.ijs');._2 [ 0 : 0
6161
g600ip
6262
gco1
6363
gco1u
6464
gco1w
6565
gibs
66+
gsco1
67+
gsco1u
68+
gsco1w
6669
gss
6770
gstack
71+
gtdot2
6872
)
6973

7074
NB. crash
71-
blacklist=: blacklist, '' ] (0~:9!:56'MEMAUDIT')#(<testpath),each <@(,&'.ijs');._2 [ 0 : 0
75+
blacklist=: blacklist, '' [ (0~:9!:56'MEMAUDIT')#(<testpath),each <@(,&'.ijs');._2 [ 0 : 0
7276
g0
7377
g128x14
7478
g128x19
7579
g128x5
80+
g212
7681
g220t
7782
g131
7883
g300
@@ -81,6 +86,7 @@ g320ip
8186
g320ipt
8287
g321
8388
g322
89+
g331
8490
g3x02
8591
g421
8692
g421c
@@ -105,12 +111,17 @@ gmmf1w
105111
gnan
106112
gq
107113
gqco
114+
gtdot
115+
gtdot1
116+
gtdot3
117+
gtdot5
118+
gxco1
108119
)
109120

110121
blacklist=: ~.blacklist
111122

112123
ddall =: testfiles 'g'
113-
3 : 0'' [ 'gq' NB. skip until
124+
3 : 0'' [ 'gtdot5' NB. skip until
114125
if. #y do.
115126
y=. '/',y,'.ijs'
116127
if. _1~: i=. {.!._1 I. (1 e. y&E.)&> ddall do. ddall=: i}.ddall end.

0 commit comments

Comments
 (0)