Skip to content

Commit

Permalink
Lowercase directory names
Browse files Browse the repository at this point in the history
Signed-off-by: Borys Popławski <[email protected]>
  • Loading branch information
boryspoplawski authored and Dmitrii Kuvaiskii committed Jun 22, 2022
1 parent 5a39aee commit 3d788ae
Show file tree
Hide file tree
Showing 659 changed files with 153 additions and 153 deletions.
2 changes: 1 addition & 1 deletion .ci/lib/config-docker.jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ env.PREFIX = env.WORKSPACE + '/usr'
// don't mess with PATH before reading this: https://issues.jenkins.io/browse/JENKINS-49076
env.DOCKER_ARGS_COMMON = """
--env=PATH=${env.PREFIX}/bin:${env.PATH}
--security-opt seccomp=${env.WORKSPACE}/Scripts/docker_seccomp.json
--security-opt seccomp=${env.WORKSPACE}/scripts/docker_seccomp.json
"""
env.DOCKER_ARGS_SGX = '''
--volume=/lib/modules:/lib/modules:ro
Expand Down
4 changes: 2 additions & 2 deletions .ci/lib/config.jenkinsfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
env.MAKEOPTS = '-j8'

python_platlib = sh(returnStdout: true, script: 'python3 Scripts/get-python-platlib.py "$PREFIX"')
env.PYTHONPATH = python_platlib + ':' + env.WORKSPACE + '/Scripts'
python_platlib = sh(returnStdout: true, script: 'python3 scripts/get-python-platlib.py "$PREFIX"')
env.PYTHONPATH = python_platlib + ':' + env.WORKSPACE + '/scripts'

// in Jenkins we can't write anything to $HOME, we must contain ourselves in $WORKSPACE
env.XDG_CONFIG_HOME = env.WORKSPACE + '/XDG_CONFIG_HOME'
Expand Down
2 changes: 1 addition & 1 deletion .ci/lib/stage-clean-check-prepare.jenkinsfile
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
stage('clean-check-prepare') {
sh './Scripts/clean-check-prepare'
sh './scripts/clean-check-prepare'
}
26 changes: 13 additions & 13 deletions .ci/lib/stage-clean-check.jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ stage('clean-check') {

REL_PREFIX=$(realpath "$PREFIX" --relative-to=.)

cd "$(./Scripts/clean-check-test-copy)"
cd "$(./scripts/clean-check-test-copy)"

# Remove our copy of $PREFIX (inside the copied source tree)
rm -rf "$REL_PREFIX"
Expand All @@ -20,15 +20,15 @@ stage('clean-check') {
# root, and keeps cache there
rm -rf .pytest_cache

make -C LibOS/test/regression clean
make -C LibOS/test/fs clean
make -C libos/test/regression clean
make -C libos/test/fs clean

gramine-test -C LibOS/test/abi/x86_64 clean
rm -rf LibOS/test/abi/x86_64/.pytest_cache \
LibOS/test/abi/x86_64/__pycache__ \
LibOS/test/abi/x86_64/*.xml
gramine-test -C libos/test/abi/x86_64 clean
rm -rf libos/test/abi/x86_64/.pytest_cache \
libos/test/abi/x86_64/__pycache__ \
libos/test/abi/x86_64/*.xml

make -C Pal/regression clean
make -C pal/regression clean

make -C CI-Examples/helloworld clean
make -C CI-Examples/python clean
Expand All @@ -45,10 +45,10 @@ stage('clean-check') {
make -C CI-Examples/ra-tls-mbedtls distclean
make -C CI-Examples/ra-tls-secret-prov distclean

make -C LibOS/test/ltp clean
make -C libos/test/ltp clean
# LTP's make clean is broken, see https://github.com/linux-test-project/ltp/issues/559
rm -rf /tmp/*.clean-check.clean/LibOS/test/ltp/src
rm -rf LibOS/test/ltp/src
rm -rf /tmp/*.clean-check.clean/libos/test/ltp/src
rm -rf libos/test/ltp/src

# python/ subdir does not have makefiles, so no clean
rm -rf /tmp/*.clean-check.clean/python/graminelibos/__pycache__
Expand All @@ -61,7 +61,7 @@ stage('clean-check') {
subprojects/*-* \
subprojects/packagecache

./Scripts/clean-check
./scripts/clean-check
'''

/*
Expand All @@ -70,6 +70,6 @@ stage('clean-check') {
*/
sh 'rm -rf "$PREFIX"'
sh '''
./Scripts/gitignore-test
./scripts/gitignore-test
'''
}
18 changes: 9 additions & 9 deletions .ci/lib/stage-test-direct.jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,20 +2,20 @@ stage('test-direct') {
try {
timeout(time: 20, unit: 'MINUTES') {
sh '''
cd LibOS/test/ltp
cd libos/test/ltp
make ${MAKEOPTS} all
'''
// Run tests in a separate block, so that Jenkins measures build time and run time
// separately
sh '''
cd LibOS/test/ltp
cd libos/test/ltp
export GRAMINE_LTP_LIVE_OUTPUT=fcntl14,fdatasync01
python3 -m pytest -v -n4 --junit-xml=ltp.xml
'''
}
} finally {
archiveArtifacts 'LibOS/test/ltp/ltp.xml'
junit 'LibOS/test/ltp/ltp.xml'
archiveArtifacts 'libos/test/ltp/ltp.xml'
junit 'libos/test/ltp/ltp.xml'
}
timeout(time: 5, unit: 'MINUTES') {
sh '''
Expand Down Expand Up @@ -50,7 +50,7 @@ stage('test-direct') {
cd CI-Examples/memcached
make -j8 all
make start-gramine-server &
../../Scripts/wait_for_server 5 127.0.0.1 11211
../../scripts/wait_for_server 5 127.0.0.1 11211
# memcslap populates server but doesn't report errors, use
# memcached-tool for this (must return two lines of stats)
memcslap --servers=127.0.0.1 --concurrency=8
Expand All @@ -67,7 +67,7 @@ stage('test-direct') {
fi
make -j8 all
make start-gramine-server &
../../Scripts/wait_for_server 5 127.0.0.1 6379
../../scripts/wait_for_server 5 127.0.0.1 6379
./src/src/redis-benchmark
'''
}
Expand All @@ -76,7 +76,7 @@ stage('test-direct') {
cd CI-Examples/lighttpd
make -j8 all
make start-gramine-server &
../../Scripts/wait_for_server 5 127.0.0.1 8003
../../scripts/wait_for_server 5 127.0.0.1 8003
LOOP=1 CONCURRENCY_LIST="1 32" ../common_tools/benchmark-http.sh 127.0.0.1:8003
'''
}
Expand All @@ -85,7 +85,7 @@ stage('test-direct') {
cd CI-Examples/nginx
make -j8 all
make start-gramine-server &
../../Scripts/wait_for_server 5 127.0.0.1 8002
../../scripts/wait_for_server 5 127.0.0.1 8002
LOOP=1 CONCURRENCY_LIST="1 32" ../common_tools/benchmark-http.sh 127.0.0.1:8002
'''
}
Expand All @@ -94,7 +94,7 @@ stage('test-direct') {
cd CI-Examples/rust
make ${MAKEOPTS}
make ${MAKEOPTS} start-gramine-server &
../../Scripts/wait_for_server 5 127.0.0.1 3000
../../scripts/wait_for_server 5 127.0.0.1 3000
LOOP=1 CONCURRENCY_LIST="1 32" ../common_tools/benchmark-http.sh 127.0.0.1:3000
'''
}
Expand Down
10 changes: 5 additions & 5 deletions .ci/lib/stage-test-sgx.jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ stage('test-sgx') {
cd CI-Examples/memcached
make ${MAKEOPTS}
make SGX=1 start-gramine-server &
../../Scripts/wait_for_server 60 127.0.0.1 11211
../../scripts/wait_for_server 60 127.0.0.1 11211
# memcslap populates server but doesn't report errors, use
# memcached-tool for this (must return two lines of stats)
memcslap --servers=127.0.0.1 --concurrency=8
Expand All @@ -52,7 +52,7 @@ stage('test-sgx') {
cd CI-Examples/redis
make ${MAKEOPTS}
make ${MAKEOPTS} start-gramine-server &
../../Scripts/wait_for_server 60 127.0.0.1 6379
../../scripts/wait_for_server 60 127.0.0.1 6379
./src/src/redis-benchmark
'''
}
Expand All @@ -61,7 +61,7 @@ stage('test-sgx') {
cd CI-Examples/lighttpd
make ${MAKEOPTS}
make ${MAKEOPTS} start-gramine-server &
../../Scripts/wait_for_server 60 127.0.0.1 8003
../../scripts/wait_for_server 60 127.0.0.1 8003
LOOP=1 CONCURRENCY_LIST="1 32" ../common_tools/benchmark-http.sh 127.0.0.1:8003
'''
}
Expand All @@ -70,7 +70,7 @@ stage('test-sgx') {
cd CI-Examples/nginx
make ${MAKEOPTS}
make ${MAKEOPTS} start-gramine-server &
../../Scripts/wait_for_server 60 127.0.0.1 8002
../../scripts/wait_for_server 60 127.0.0.1 8002
LOOP=1 CONCURRENCY_LIST="1 32" ../common_tools/benchmark-http.sh 127.0.0.1:8002
'''
}
Expand All @@ -79,7 +79,7 @@ stage('test-sgx') {
cd CI-Examples/rust
make ${MAKEOPTS}
make ${MAKEOPTS} start-gramine-server &
../../Scripts/wait_for_server 60 127.0.0.1 3000
../../scripts/wait_for_server 60 127.0.0.1 3000
LOOP=1 CONCURRENCY_LIST="1 32" ../common_tools/benchmark-http.sh 127.0.0.1:3000
'''
}
Expand Down
20 changes: 10 additions & 10 deletions .ci/lib/stage-test.jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,24 +2,24 @@ stage('test') {
timeout(time: 15, unit: 'MINUTES') {
try {
sh '''
cd Pal/regression
cd pal/regression
gramine-test build -v
python3 -m pytest -v --junit-xml pal-regression.xml
'''
} finally {
junit 'Pal/regression/pal-regression.xml'
junit 'pal/regression/pal-regression.xml'
}
}

timeout(time: 15, unit: 'MINUTES') {
try {
sh '''
cd LibOS/test/regression
cd libos/test/regression
RA_TYPE=epid RA_CLIENT_SPID=${ra_client_spid} gramine-test build -v
python3 -m pytest -v --junit-xml libos-regression.xml
'''
} finally {
junit 'LibOS/test/regression/libos-regression.xml'
junit 'libos/test/regression/libos-regression.xml'
}
}

Expand All @@ -28,40 +28,40 @@ stage('test') {
try {
sh '''
export GRAMINE_MUSL=1
cd LibOS/test/regression
cd libos/test/regression
# For some unknown reason it fails without this clean on sgx-18.04 pipeline
gramine-test clean
RA_TYPE=epid RA_CLIENT_SPID=${ra_client_spid} \
gramine-test -n tests_musl.toml build -v
python3 -m pytest -v --junit-xml libos-regression-musl.xml
'''
} finally {
junit 'LibOS/test/regression/libos-regression-musl.xml'
junit 'libos/test/regression/libos-regression-musl.xml'
}
}
}

timeout(time: 15, unit: 'MINUTES') {
try {
sh '''
cd LibOS/test/abi/x86_64
cd libos/test/abi/x86_64
gramine-test build -v
python3 -m pytest -v --junit-xml abi.xml
'''
} finally {
junit 'LibOS/test/abi/x86_64/*.xml'
junit 'libos/test/abi/x86_64/*.xml'
}
}

timeout(time: 15, unit: 'MINUTES') {
try {
sh '''
cd LibOS/test/fs
cd libos/test/fs
gramine-test build -v
python3 -m pytest -v --junit-xml fs.xml
'''
} finally {
junit 'LibOS/test/fs/*.xml'
junit 'libos/test/fs/*.xml'
}
}
}
6 changes: 3 additions & 3 deletions .ci/run-pylint
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ if [ -z "$PYLINT" ]; then
fi

find . -name \*.py \
-and -not -path ./LibOS/test/ltp/src/\* \
-and -not -path ./LibOS/test/ltp/build/\* \
-and -not -path ./LibOS/test/ltp/install/\* \
-and -not -path ./libos/test/ltp/src/\* \
-and -not -path ./libos/test/ltp/build/\* \
-and -not -path ./libos/test/ltp/install/\* \
-and -not -name ninja_syntax.py \
| sed 's/./\\&/g' \
| xargs "${PYLINT}" "$@" \
Expand Down
10 changes: 5 additions & 5 deletions .ci/run-shellcheck
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@ LC_ALL=C.UTF-8 shellcheck "$@" \
CI-Examples/common_tools/benchmark-http.sh \
CI-Examples/python/run-tests.sh \
tools/gramine.in \
Scripts/clean-check \
Scripts/clean-check-prepare \
Scripts/clean-check-test-copy \
Scripts/download \
Scripts/gitignore-test \
scripts/clean-check \
scripts/clean-check-prepare \
scripts/clean-check-test-copy \
scripts/download \
scripts/gitignore-test \
.ci/run-pylint \
.ci/run-shellcheck
4 changes: 2 additions & 2 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
[submodule "LibOS/test/ltp/src"]
path = LibOS/test/ltp/src
[submodule "libos/test/ltp/src"]
path = libos/test/ltp/src
url = https://github.com/linux-test-project/ltp.git
2 changes: 1 addition & 1 deletion CI-Examples/python/run-tests.sh
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ rm OUTPUT
# === web server and client (on port 8005) ===
echo -e "\n\nRunning HTTP server dummy-web-server.py in the background:"
$GRAMINE ./python scripts/dummy-web-server.py 8005 & echo $! > server.PID
../../Scripts/wait_for_server 60 127.0.0.1 8005
../../scripts/wait_for_server 60 127.0.0.1 8005

echo -e "\n\nRunning HTTP client test-http.py:"
$GRAMINE ./python scripts/test-http.py 127.0.0.1 8005 > OUTPUT1
Expand Down
2 changes: 1 addition & 1 deletion CI-Examples/ra-tls-secret-prov/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ ssl/server.crt: ssl/ca_config.conf

######################### CLIENT/SERVER EXECUTABLES ###########################

CFLAGS += -Wall -std=c11 -I$(GRAMINEDIR)/Pal/src/host/Linux-SGX/tools/ra-tls \
CFLAGS += -Wall -std=c11 -I$(GRAMINEDIR)/pal/src/host/linux-sgx/tools/ra-tls \
$(shell pkg-config --cflags mbedtls_gramine)
LDFLAGS += $(shell pkg-config --libs mbedtls_gramine)

Expand Down
12 changes: 6 additions & 6 deletions CONTRIBUTING.rst
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ Reviewing Guidelines
formatting fixes mixed with features, no moving files and changing them at
the same time).
#. Meaningful commit messages (it's much easier to get them right if commits are
really atomic). Should include which component was changed (Pal-{Linux,SGX}
really atomic). Should include which component was changed (PAL-{Linux,SGX}
/ LibOS / Docs / CI) in the format "[component] change description".
#. Every PR description should include: what's the purpose of the changes, what
is changed (and how, in case of redesigning a component), and how to test the
Expand Down Expand Up @@ -201,12 +201,12 @@ directory with ``-Dtests=enabled`` and install Gramine::

To run the PAL tests::

cd Pal/regression
cd pal/regression
gramine-test pytest -v

For SGX, one needs to do the following::

cd Pal/regression
cd pal/regression
gramine-test --sgx pytest -v

It is also possible to run a subset of tests::
Expand All @@ -231,7 +231,7 @@ For more information, run :command:`gramine-test --help` and
:command:`gramine-test <command> --help`.

The LibOS unit tests work similarly, and are under
:file:`LibOS/test/regression`.
:file:`libos/test/regression`.

LTP
^^^
Expand All @@ -241,7 +241,7 @@ currently only supported on the Linux PAL.

To run these tests::

cd LibOS/test/ltp
cd libos/test/ltp
# consider -j$(nproc) or similar to parallelize and improve the build time.
make
make regression
Expand All @@ -251,7 +251,7 @@ To run these tests::
python3 -m pytest -v -k chmod01

For more information on how to run the ltp tests, please refer to
:file:`LibOS/test/ltp/README.rst`.
:file:`libos/test/ltp/README.rst`.


Management Team
Expand Down
4 changes: 2 additions & 2 deletions Documentation/Doxyfile-libos
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@
PROJECT_NAME = "LibOS"
OUTPUT_DIRECTORY = _build/doxygen-libos
INPUT = \
../LibOS/include \
../LibOS/src
../libos/include \
../libos/src
2 changes: 1 addition & 1 deletion Documentation/Doxyfile-pal
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
@INCLUDE = Doxyfile
PROJECT_NAME = "PAL"
OUTPUT_DIRECTORY = _build/doxygen-pal
INPUT = ../Pal/include/arch/x86_64 ../Pal/include/pal ../Pal/include
INPUT = ../pal/include/arch/x86_64 ../pal/include/pal ../pal/include
MACRO_EXPANSION = YES
EXPAND_ONLY_PREDEF = YES
PREDEFINED = noreturn= __x86_64__=1
Loading

0 comments on commit 3d788ae

Please sign in to comment.