Skip to content

Commit a0fc356

Browse files
Merge branch 'development' into benchmark-total
2 parents 98c4372 + 60e5e47 commit a0fc356

7 files changed

Lines changed: 9 additions & 4 deletions

File tree

‎.containers/coatjava.Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,4 +23,4 @@ ARG REF_NAME=development
2323
RUN java --version && cd /opt && \
2424
git clone https://code.jlab.org/hallb/alert/coatjava.git && cd coatjava && \
2525
git fetch origin && git checkout ${REF_NAME} && ./build-coatjava.sh --quiet && \
26-
./install-clara /opt/clara
26+
./bin/install-clara /opt/clara

‎.github/workflows/ci.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ jobs:
8888
- name: build
8989
run: |
9090
./build-coatjava.sh --lfs --no-progress -T${{ env.nthreads }}
91-
./install-clara -b -c ./coatjava ./clara
91+
./bin/install-clara -b -c ./coatjava ./clara
9292
- name: tar # tarball to preserve permissions
9393
run: |
9494
tar czvf coatjava.tar.gz coatjava
File renamed without changes.

‎build-coatjava.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -368,6 +368,6 @@ done
368368
echo "installed coatjava to: $prefix_dir"
369369

370370
# install clara
371-
if $installClara; then ./install-clara -c $prefix_dir $clara_home; fi
371+
if $installClara; then ./bin/install-clara -c $prefix_dir $clara_home; fi
372372

373373
echo "COATJAVA SUCCESSFULLY BUILT !"

‎common-tools/clas-io/src/main/java/org/jlab/utils/HipoDiff.java‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -134,5 +134,9 @@ public static void main(String args[]) {
134134
for (String name : badEntries.keySet()) {
135135
System.out.println(name + " " + badEntries.get(name));
136136
}
137+
138+
if (nbadevent + nbadrow + nbadentry > 0) {
139+
System.exit(7);
140+
}
137141
}
138142
}

‎common-tools/clas-utils/src/main/java/org/jlab/utils/options/OptionParser.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -179,6 +179,7 @@ else if(this.containsOptions(arguments,"-v","-version")==true){
179179
}
180180
}
181181
if (this.requiresInputList && this.parsedInputList.isEmpty()) {
182+
printUsage();
182183
System.err.println(" \n*** ERROR *** Empty Input List.");
183184
System.exit(101);
184185
}

‎validation/advanced-tests/run-eb-tests.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ then
118118
# install clara
119119
if ! [ -d clara_installation ]
120120
then
121-
../../install-clara clara_installation
121+
../../bin/install-clara clara_installation
122122
fi
123123
fi
124124

0 commit comments

Comments
 (0)