From 1a9187c48d331c724b66fff2d0ac77a354a9f4e7 Mon Sep 17 00:00:00 2001
From: Columbus240
Date: Sat, 12 Sep 2020 22:18:31 +0200
Subject: Note in docs that some tests require cvc4

---
 BUILDING.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/BUILDING.md b/BUILDING.md
index 8df08e0b..88bcfbcc 100644
--- a/BUILDING.md
+++ b/BUILDING.md
@@ -130,7 +130,8 @@ make isail
 To test Sail is installed correctly, execute the following from the
 root directory of the sail repository. You may also need to set
 $LEM_DIR to the root of the lem repository for the lem tests. Some of
-the C backend tests will fail if valgrind isn't installed.
+the C backend tests will fail if valgrind isn't installed. Some tests will
+fail if cvc4 isn’t installed.
 ```
 export SAIL_DIR=$PWD
 test/run_tests.sh
-- 
cgit v1.2.3


From 8f5b97b4315440e75658ce2165761bf086ad3e11 Mon Sep 17 00:00:00 2001
From: Columbus240
Date: Mon, 24 Aug 2020 19:22:41 +0200
Subject: gitignore test artifacts of c and coq tests

The "c" tests produce some *.h files that didn’t get ignored. The "coq"
tests also produce some files that weren’t ignored.
---
 .gitignore | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/.gitignore b/.gitignore
index 70888f90..944ca88b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -60,12 +60,17 @@ lib/hol/sail-heap
 /test/smt/*.out
 /test/smt/*.smt2
 /test/c/*.c
+/test/c/*.h
 /test/c/*.result
 /test/c/*.iresult
 /test/c/*.oresult
 /test/c/*.bin
 /test/c/*_ocaml
 /test/c/_sbuild*
+/test/coq/.lia.cache
+/test/coq/.nia.cache
+/test/coq/out.v
+/test/coq/out_types.v
 /test/mono/Out_lemmas.thy
 /test/mono/log
 /test/mono/test.cmi
-- 
cgit v1.2.3


From a8be1e2551bc4fbda9c45792c0dad5743c18fefd Mon Sep 17 00:00:00 2001
From: Columbus240
Date: Mon, 24 Aug 2020 19:27:33 +0200
Subject: Merge some of the gitignore files

Both /.gitignore and /lib/coq/.gitignore ignored some files in /lib/coq.
This commit removes /lib/coq/.gitignore and moves all ignore-statements
to /.gitignore . This should simplify the maintenance of gitignore files.

The situation with /test/mono/.gitignore is analogous.
---
 .gitignore           | 2 ++
 lib/coq/.gitignore   | 1 -
 test/mono/.gitignore | 1 -
 3 files changed, 2 insertions(+), 2 deletions(-)
 delete mode 100644 lib/coq/.gitignore
 delete mode 100644 test/mono/.gitignore

diff --git a/.gitignore b/.gitignore
index 944ca88b..f21c4c53 100644
--- a/.gitignore
+++ b/.gitignore
@@ -33,6 +33,7 @@ lib/hol/sail-heap
 *.glob
 .*.aux
 /lib/coq/.nia.cache
+/lib/coq/deps
 
 # Isabelle
 
@@ -75,6 +76,7 @@ lib/hol/sail-heap
 /test/mono/log
 /test/mono/test.cmi
 /test/mono/test.cmo
+/test/mono/test-output
 
 /language/*.pdf
 /language/*.uo
diff --git a/lib/coq/.gitignore b/lib/coq/.gitignore
deleted file mode 100644
index 1aa62803..00000000
--- a/lib/coq/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-deps
\ No newline at end of file
diff --git a/test/mono/.gitignore b/test/mono/.gitignore
deleted file mode 100644
index bb7f92e1..00000000
--- a/test/mono/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-test-output
\ No newline at end of file
-- 
cgit v1.2.3


From f1cf2c07f6d3bc041fba8f0d048b32d642837815 Mon Sep 17 00:00:00 2001
From: Columbus240
Date: Sat, 12 Sep 2020 22:39:00 +0200
Subject: Docs: Mention "opam pin" and reword a detail

opam pin is useful in the development workflow.

About the rewording: The tests of Sail check the behavior of Sail and
not whether it is installed correctly, because the instructions above
that paragraph don’t install Sail, they just build it.
These circumstances weren’t represented appropriately by the text.
---
 BUILDING.md | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/BUILDING.md b/BUILDING.md
index 88bcfbcc..7e63de0c 100644
--- a/BUILDING.md
+++ b/BUILDING.md
@@ -127,7 +127,7 @@ To build Sail with interactive support we need two more commands
 opam install linenoise
 make isail
 ```
-To test Sail is installed correctly, execute the following from the
+To test if Sail behaves correctly, execute the following from the
 root directory of the sail repository. You may also need to set
 $LEM_DIR to the root of the lem repository for the lem tests. Some of
 the C backend tests will fail if valgrind isn't installed. Some tests will
@@ -136,3 +136,12 @@ fail if cvc4 isn’t installed.
 export SAIL_DIR=$PWD
 test/run_tests.sh
 ```
+
+To install Sail using OPAM from the git repo, use `opam pin` as follows.
+```
+opam pin add sail /path/to/local/sail/repo
+```
+This way, you can make the most recent changes to Sail easily available to programs
+that use it. To rebuild this installation of Sail, use `opam upgrade` as usual.
+If you want to do more complicated things, `opam pin --help` might be of
+interest.
-- 
cgit v1.2.3