From e35c25e69f278b277ca3094c0bb22392276b6058 Mon Sep 17 00:00:00 2001
From: Eric Gallager <egall@gwmail.gwu.edu>
Date: Sun, 2 Jun 2024 22:17:08 -0400
Subject: [PATCH] CodeQL fails...

---
 .github/workflows/codeql.yml | 9 +++++----
 batteries/Makefile           | 8 ++++----
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
index dff621e..532a7a7 100644
--- a/.github/workflows/codeql.yml
+++ b/.github/workflows/codeql.yml
@@ -74,11 +74,10 @@ jobs:
         sudo apt-get -qq install -y libc6-dev-amd64-cross libgcc-s1-amd64-cross libtbb-dev libfl-dev ocaml camlp4 ocaml-findlib camlidl binutils-dev libiberty-dev libprotobuf-dev ocamlbuild oasis liboasis-ocaml liboasis-ocaml-dev opam erlang erlang-base libprotoc-dev ocamlweb binfmtc llvm llvm-dev clang llvm-runtime libllvm-ocaml-dev exuberant-ctags libparse-exuberantctags-perl libcamomile-ocaml-dev libgettext-ocaml libgettext-ocaml-dev z3 libz3-dev libz3-java libz3-jni libbatteries-ocaml-dev ocaml-batteries-included liblablgl-ocaml liblablgl-ocaml-dev liblablgtk2-ocaml liblablgtk2-ocaml-dev liblablgtk2-gnome-ocaml liblablgtk2-gnome-ocaml-dev liblablgtk2-gl-ocaml liblablgtk2-gl-ocaml-dev liblablgtk-extras-ocaml-dev liblablgtk3-ocaml liblablgtk3-ocaml-dev liblablgtksourceview3-ocaml liblablgtksourceview3-ocaml-dev liblablgtkspell3-ocaml liblablgtkspell3-ocaml-dev dh-make libasprintf-dev libgettextpo-dev
         sudo apt-get install -y gcj-jdk || echo "will just have to do without gcj..."
         which -a opam
-        opam -y init
-        opam init --shell-setup
-        eval $(opam env --switch=default)
+        opam -y init --shell-setup
+        eval "$(opam env --switch=default)"
         export CHECK_IF_PREINSTALLED=false
-        opam -y install xmlm ulex easy-format camomile gettext-camomile camlidl
+        opam -y install xmlm ulex easy-format camomile gettext-camomile camlidl batteries
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
@@ -86,6 +85,8 @@ jobs:
       with:
         languages: ${{ matrix.language }}
         build-mode: ${{ matrix.build-mode }}
+      env:
+        MAKEFLAGS: -ki
         # If you wish to specify custom queries, you can do so here or in a config file.
         # By default, queries listed here will override any specified in a config file.
         # Prefix the list here with "+" to use these queries and those in the config file.
diff --git a/batteries/Makefile b/batteries/Makefile
index 60ab8cf..1346fff 100644
--- a/batteries/Makefile
+++ b/batteries/Makefile
@@ -36,7 +36,7 @@ INSTALL_FILES = _build/META _build/src/*.cma \
 	ocamlinit build/ocaml
 NATIVE_INSTALL_FILES = _build/src/*.cmx _build/src/*.a _build/src/*.cmxa
 
-# What to build
+# What to build:
 TARGETS = syntax.otarget byte.otarget src/batteries_help.cmo META
 BENCH_TARGETS = benchsuite/bench_int.native benchsuite/bench_map.native
 TEST_TARGET = test-byte
@@ -104,7 +104,7 @@ reinstall:
 	$(MAKE) uninstall
 	$(MAKE) install
 
-#List of source files that it's okay to try to test
+# List of source files that it ought to be okay to try to test:
 DONTTEST=$(wildcard src/batCamomile-*.ml) src/batteries_help.ml
 TESTABLE ?= $(filter-out $(DONTTEST), $(wildcard src/*.ml))
 
@@ -178,11 +178,11 @@ camfailunk:
 _build/build/make_suite.$(EXT): build/make_suite.mll
 	$(OCAMLBUILD) $(OCAMLBUILDFLAGS) make_suite.$(EXT)
 
-#convert a source file to a test suite by filtering special comments
+# Convert a source file to a test suite by filtering special comments:
 qtest/%_t.ml: src/%.ml _build/build/make_suite.$(EXT)
 	_build/build/make_suite.$(EXT) $< > $@
 
-#put all the testing modules in a library
+# Put all the testing modules in a library:
 qtest/test_mods.mllib:
 	/bin/echo -n "Quickcheck Tests " > $@
 	echo $(patsubst src/%.ml,%_t, $(TESTABLE)) >> $@