Skip to content

Commit cf26cb6

Browse files
committed
Fix
1 parent ef74922 commit cf26cb6

File tree

3 files changed

+19
-9
lines changed

3 files changed

+19
-9
lines changed

.github/workflows/amd64.yml

+8-3
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,16 @@ jobs:
2222
- name: Run tests
2323
run: |
2424
sudo apt update && sudo apt install -y gdb pip curl python3-dev llvm \
25-
openjdk-17-jdk ca-certificates gnupg lua5.1 liblua5.1-dev
25+
openjdk-17-jdk ca-certificates gnupg lua5.4 liblua5.4-dev libcurl4-gnutls-dev
2626
wget https://luarocks.org/releases/luarocks-3.11.1.tar.gz && tar zxpf luarocks-3.11.1.tar.gz && \
2727
cd luarocks-3.11.1 && ./configure && make && sudo make install && cd .. && rm -rf luarocks-3.11.1.tar.gz luarocks-3.11.1
28-
git clone https://github.com/azanegin/luzer.git && \
29-
cd luzer && git checkout 77642ba37430eded66d171a68d7e9c3f6347d625 && luarocks --local build && cd .. && rm -rf luzer
28+
eval $(luarocks path)
29+
wget https://github.com/tarantool/luajit/archive/refs/tags/v2.1.0-beta3.tar.gz && \
30+
tar zxpf v2.1.0-beta3.tar.gz && rm v2.1.0-beta3.tar.gz && cd luajit-2.1.0-beta3 && \
31+
make && sudo make install && sudo ln -sf luajit-2.1.0-beta3 /usr/local/bin/luajit && cd .. && rm -rf luajit-2.1.0-beta3
32+
git clone https://github.com/ligurio/luzer.git && \
33+
cd luzer && git checkout 6e3276c5e6faf18c8c98637162bea0a23f0cd1d3 && luarocks --local build && cd .. && sudo rm -rf luzer
34+
export LUA_CPATH="/home/runner/work/casr/casr/luzer/build.luarocks/luzer/?.so;$LUA_CPATH"
3035
# Atheris fails to install on Ubuntu 24.04, see https://github.com/google/atheris/issues/82
3136
# pip3 install atheris
3237
sudo mkdir -p /etc/apt/keyrings

.github/workflows/coverage.yaml

+8-3
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,16 @@ jobs:
1919
- name: Install Dependences
2020
run: |
2121
sudo apt update && sudo apt install -y gdb pip curl python3-dev llvm \
22-
openjdk-17-jdk ca-certificates gnupg lua5.1 liblua5.1-dev
22+
openjdk-17-jdk ca-certificates gnupg lua5.4 liblua5.4-dev libcurl4-gnutls-dev
2323
wget https://luarocks.org/releases/luarocks-3.11.1.tar.gz && tar zxpf luarocks-3.11.1.tar.gz && \
2424
cd luarocks-3.11.1 && ./configure && make && sudo make install && cd .. && rm -rf luarocks-3.11.1.tar.gz luarocks-3.11.1
25-
git clone https://github.com/azanegin/luzer.git && \
26-
cd luzer && git checkout 77642ba37430eded66d171a68d7e9c3f6347d625 && luarocks --local build && cd .. && rm -rf luzer
25+
eval $(luarocks path)
26+
wget https://github.com/tarantool/luajit/archive/refs/tags/v2.1.0-beta3.tar.gz && \
27+
tar zxpf v2.1.0-beta3.tar.gz && rm v2.1.0-beta3.tar.gz && cd luajit-2.1.0-beta3 && \
28+
make && sudo make install && sudo ln -sf luajit-2.1.0-beta3 /usr/local/bin/luajit && cd .. && rm -rf luajit-2.1.0-beta3
29+
git clone https://github.com/ligurio/luzer.git && \
30+
cd luzer && git checkout 6e3276c5e6faf18c8c98637162bea0a23f0cd1d3 && luarocks --local build && cd .. && sudo rm -rf luzer
31+
export LUA_CPATH="/home/runner/work/casr/casr/luzer/build.luarocks/luzer/?.so;$LUA_CPATH"
2732
pip3 install atheris
2833
sudo mkdir -p /etc/apt/keyrings
2934
curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | sudo gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg

casr/tests/tests.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -4994,6 +4994,7 @@ fn test_casr_lua() {
49944994
String::from_utf8_lossy(&output.stdout),
49954995
String::from_utf8_lossy(&output.stderr)
49964996
);
4997+
println!("{}", String::from_utf8_lossy(&output.stdout));
49974998

49984999
let report: Result<Value, _> = serde_json::from_slice(&output.stdout);
49995000
if let Ok(report) = report {
@@ -5079,13 +5080,12 @@ fn test_casr_libfuzzer_luzer() {
50795080
String::from_utf8_lossy(&output.stderr)
50805081
);
50815082
let err = String::from_utf8_lossy(&output.stderr);
5082-
println!("{}", err);
50835083

50845084
assert!(!err.is_empty());
50855085

50865086
assert!(err.contains("NOT_EXPLOITABLE"));
5087-
assert!(err.contains("attempt to perform arithmetic on a nil value"));
5088-
assert!(err.contains("attempt to index a nil value"));
5087+
assert!(err.contains("attempt to perform arithmetic"));
5088+
assert!(err.contains("attempt to index"));
50895089
assert!(err.contains("bad argument #1 to 'insert'"));
50905090
assert!(err.contains("XmlParser.lua"));
50915091
assert!(err.contains("tree.lua"));

0 commit comments

Comments
 (0)