[infer][PR] Move to base64.3.0.0

Summary:
Move codebase to `base64.3.0.0` which is more safe (see [CHANGELOG](https://github.com/mirage/ocaml-base64/releases/tag/v3.0.0).
Pull Request resolved: https://github.com/facebook/infer/pull/1056

Reviewed By: mbouaziz

Differential Revision: D13986683

Pulled By: jvillard

fbshipit-source-id: a89b8cf89
master
Calascibetta Romain 6 years ago committed by Facebook Github Bot
parent bd136ac24e
commit 137e070ece

@ -490,7 +490,7 @@ module NonNegativePolynomial = struct
(NonNegativeNonTopPolynomial.degree_term p)
let encode astate = Marshal.to_string astate [] |> B64.encode
let encode astate = Marshal.to_string astate [] |> Base64.encode_exn
let decode enc_str = Marshal.from_string (B64.decode enc_str) 0
let decode enc_str = Marshal.from_string (Base64.decode_exn enc_str) 0
end

@ -9,6 +9,6 @@ open! IStd
type t = Location.t list
let encode decoded = B64.encode (Marshal.to_string decoded [])
let encode decoded = Base64.encode_exn (Marshal.to_string decoded [])
let decode encoded = Marshal.from_string (B64.decode encoded) 0
let decode encoded = Marshal.from_string (Base64.decode_exn encoded) 0

@ -12,7 +12,10 @@ toplevel.exp.test: $(BUILD_DIR)/test/infertop.bc $(SCRIPT_DIR)/infer_repl \
$(SCRIPT_DIR)/toplevel_init $(INFER_DIR)/tests/repl/infer_batch_script.mltop
$(QUIET)$(call silent_on_success,Testing infer OCaml REPL,\
BUILD_DIR=$(BUILD_DIR)/test \
$(SCRIPT_DIR)/infer_repl $(INFER_DIR)/tests/repl/infer_batch_script.mltop > $@)
$(SCRIPT_DIR)/infer_repl $(INFER_DIR)/tests/repl/infer_batch_script.mltop | \
sed -e 's#^The files .*/extLib.cma$$#The files [...]/extLib.cma#' \
-e 's#^and .*/infertop.bc$$#and [...]/infertop.bc#' \
> $@)
.PHONY: print
print: toplevel.exp.test

@ -7,5 +7,8 @@ Findlib has been successfully loaded. Additional directives:
Topfind.reset();; to force that packages will be reloaded
#thread;; to enable threads
The files [...]/extLib.cma
and [...]/infertop.bc
disagree over interface Base64
n$5
false

@ -23,7 +23,7 @@ depends: [
"ANSITerminal" {>="0.7"}
"apron"
"atdgen" {>="2.0.0"}
"base64" {<"3.0.0"}
"base64" {>="3.0.0"}
"cmdliner" {>="1.0.0"}
"core"
"conf-autoconf" {build}

@ -13,7 +13,8 @@ build: [
["./configure"
"--disable-c-analyzers"
"--prefix=%{prefix}%"]
[make "-j%{jobs}%"]
[make "-j" jobs]
[make "-j" jobs "config_tests"] {with-test}
]
install: [
[make "install"]
@ -29,7 +30,7 @@ depends: [
"base-bytes" {= "base"}
"base-threads" {= "base"}
"base-unix" {= "base"}
"base64" {= "2.3.0"}
"base64" {= "3.1.0"}
"bin_prot" {= "v0.11.0"}
"biniou" {= "1.2.0"}
"camlidl" {= "1.05"}

Loading…
Cancel
Save