Skip to content

Fix the command checking the results of NIST test and the read functoin of RELATIVE files #98

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
May 28, 2023
Merged

Fix the command checking the results of NIST test and the read functoin of RELATIVE files #98

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c21a078
temp: update Makefile.am and cicd.yml
yutaro-sakamoto May 28, 2023
40d6dc1
temp: fix the bug of RELATIVE files
yutaro-sakamoto May 28, 2023
9c5cc83
update: format java files and update cicd.yml
yutaro-sakamoto May 28, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/cicd.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ jobs:
- name: Run NIST test
run: |
export CLASSPATH=":/usr/lib/opensourcecobol4j/libcobj.jar:$HOME/.java_lib/sqlite.jar"
cd tests/cobol85/
cd tests/cobol85
make test

#- name: Run tests "i18n_utf8"
Expand Down
3 changes: 2 additions & 1 deletion libcobj/src/jp/osscons/opensourcecobol/libcobj/file/CobolRelativeFile.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
package jp.osscons.opensourcecobol.libcobj.file;

import java.io.*;
import java.nio.ByteBuffer;
import java.nio.channels.*;
import java.nio.file.Files;
import java.nio.file.Path;
Expand Down Expand Up @@ -283,7 +284,7 @@ public int read_(AbstractCobolField key, int readOpts) {
return COB_STATUS_23_KEY_NOT_EXISTS;
}

if (this.record.getSize() == 0) {
if (ByteBuffer.wrap(size).getLong() == 0) {
this.fp.seek(this.fp.getFilePointer() - size.length);
return COB_STATUS_23_KEY_NOT_EXISTS;
}
Expand Down
4 changes: 2 additions & 2 deletions tests/cobol85/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,10 @@ test: $(MODULES_MAKEFILES)
done
perl $(srcdir)/summary.pl $(MODULES) > summary.log
@for MODULE in $(MODULES); do\
(cat $$MODULE/report.txt) \
(cat $$MODULE/report.txt) \
done
cat summary.log
head -n -2 summary.log | tail -n +4 | awk '$$4 != 0 || $$5 != 0 {exit 1}'
cat summary.log | tail -n 1 | awk '$$4 != 0 || $$5 != 0 || $$2 != $$3 {exit 1}'

save:
@for m in $(MODULES); do \
Expand Down
4 changes: 2 additions & 2 deletions tests/cobol85/Makefile.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -491,10 +491,10 @@ test: $(MODULES_MAKEFILES)
done
perl $(srcdir)/summary.pl $(MODULES) > summary.log
@for MODULE in $(MODULES); do\
(cat $$MODULE/report.txt) \
(cat $$MODULE/report.txt) \
done
cat summary.log
head -n -2 summary.log | tail -n +4 | awk '$$4 != 0 || $$5 != 0 {exit 1}'
cat summary.log | tail -n 1 | awk '$$4 != 0 || $$5 != 0 || $$2 != $$3 {exit 1}'

save:
@for m in $(MODULES); do \
Expand Down
1 change: 0 additions & 1 deletion tests/cobol85/report.pl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,6 @@
$skip{SG203A} = 1;
$skip{OBNC1M} = 1;
$skip{OBNC2M} = 1;
#$skip{IX106A} = 1;
$skip{NC127A} = 1;
$skip{NC219A} = 1;
$skip{IC222A} = 1;
Expand Down