Skip to content

Commit

Permalink
Add vps and makeself (#47)
Browse files Browse the repository at this point in the history
* Complete vps-audit and makeself benchmarks for CI integration + minor visualization additions

* set-up-to-date

* deps fix

* fix deps

* fix deps v2

* fixes

* fixes

* remove extra files

* vps-audit verification changes

* Added makeself, vps-audit and vps-audit with negation

* change verification for vps, added vps-negate to ci

* Make vps-audit work with existing Docker image

* Changed README.md for iptables to work

* vps verification changes

* fix infotest because of varying bin sizes

* Make verify.sh fit common format

Signed-off-by: Evangelos Lamprou <[email protected]>

* vps-audit-negate verification fixes

* Minor fixes on makeself

* Added new benchmarks on tests.yml

---------

Signed-off-by: Evangelos Lamprou <[email protected]>
Co-authored-by: Evangelos Lamprou <[email protected]>
  • Loading branch information
Geoka1 and vagos authored Jan 6, 2025
1 parent 5b76c47 commit 9af4060
Show file tree
Hide file tree
Showing 45 changed files with 303,258 additions and 298 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
strategy:
fail-fast: false
matrix:
benchmark: [nlp, file-enc, unix50, log-analysis, max-temp, media-conv, sklearn, covid-mts, riker, oneliners, web-index, bio, aurpkg]
benchmark: [nlp, file-enc, unix50, log-analysis, max-temp, uniq-ips, media-conv, sklearn, covid-mts, riker, oneliners, web-index, vps-audit, vps-audit-negate, makeself]

steps:
- name: Checkout code
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@
$ docker build -t bensh .

# Run the container
$ docker run -it bensh
$ docker run --cap-add NET_ADMIN --cap-add NET_RAW -it bensh

# For development, mount the benchmarks directory
docker run -it -v "$(pwd):/benchmarks" bensh
docker run --cap-add NET_ADMIN --cap-add NET_RAW -it -v "$(pwd):/benchmarks" bensh
```
9 changes: 9 additions & 0 deletions infrastructure/data/script-globs.json
Original file line number Diff line number Diff line change
Expand Up @@ -34,5 +34,14 @@
},
"web-index": {
"scripts": ["web-index/scripts/*.sh"]
},
"makeself": {
"scripts": ["makeself/makeself/*.sh"]
},
"vps-audit": {
"scripts": ["vps-audit/scripts/*.sh"]
},
"vps-audit-negate": {
"scripts": ["vps-audit-negate/scripts/*.sh"]
}
}
98 changes: 0 additions & 98 deletions infrastructure/target/lines_of_code.csv

This file was deleted.

98 changes: 0 additions & 98 deletions infrastructure/target/nodes_in_scripts.csv

This file was deleted.

98 changes: 0 additions & 98 deletions infrastructure/target/scripts_to_benchmark.csv

This file was deleted.

2 changes: 1 addition & 1 deletion infrastructure/viz/syntax.py
Original file line number Diff line number Diff line change
Expand Up @@ -101,4 +101,4 @@ def main(data_path):
node_heatmap(df)

if __name__ == '__main__':
main(data_path)
main(data_path)
13 changes: 13 additions & 0 deletions makeself/cleanup.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
#! /bin/bash

BASE_DIR="$(dirname "$(readlink -f "$0")")"
TEST_DIR="${BASE_DIR}/makeself/test"
find "${TEST_DIR}" -type f -name "*.log" -exec rm -f {} +

if [[ -f run_results.log ]]; then
rm run_results.log
fi

if [[ -f verify_results.log ]]; then
rm verify_results.log
fi
17 changes: 17 additions & 0 deletions makeself/deps.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
#! /bin/bash

sudo apt update

sudo apt install -y \
binutils \
git \
build-essential \
coreutils \
wget \
unzip \
make \
pbzip2 \
binutils \
bzip2 \
zstd \
gnupg
1 change: 1 addition & 0 deletions makeself/input.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
#! /bin/bash
18 changes: 18 additions & 0 deletions makeself/makeself/Makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
.PHONY: all clean test help

VERSION := $(shell cat VERSION)
OUTPUT := makeself-$(VERSION).run

all: $(OUTPUT)

$(OUTPUT): makeself.sh makeself-header.sh VERSION
./make-release.sh

clean:
$(RM) makeself-*.run

test:
./test/run-tests.sh

help:
$(info Targets: all $(OUTPUT) clean test help)
1 change: 1 addition & 0 deletions makeself/makeself/VERSION
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
2.5.0
Loading

0 comments on commit 9af4060

Please sign in to comment.