Commit c44e2c1 1 parent 6d6923b commit c44e2c1 Copy full SHA for c44e2c1
File tree 2 files changed +19
-4
lines changed
automated/linux/libhugetlbfs
2 files changed +19
-4
lines changed Original file line number Diff line number Diff line change @@ -11,6 +11,7 @@ TEST_PASS_LOG="${OUTPUT}/test_pass_log.txt"
11
11
TEST_FAIL_LOG=" ${OUTPUT} /test_fail_log.txt"
12
12
TEST_SKIP_LOG=" ${OUTPUT} /test_skip_log.txt"
13
13
CWD=" "
14
+ LIBHUGETLBFS_PATH=" "
14
15
15
16
WORD_SIZE=" 64"
16
17
VERSION=" 02df38e93e25e07f4d54edae94fb4ec90b7a2824"
@@ -20,9 +21,10 @@ usage() {
20
21
exit 1
21
22
}
22
23
23
- while getopts " b:s:v:" o; do
24
+ while getopts " b:p: s:v:" o; do
24
25
case " $o " in
25
26
b) WORD_SIZE=" ${OPTARG} " ;;
27
+ p) LIBHUGETLBFS_PATH=" ${OPTARG} " ;;
26
28
s) SKIP_INSTALL=" ${OPTARG} " ;;
27
29
v) VERSION=" ${OPTARG} " ;;
28
30
* ) usage ;;
@@ -163,9 +165,19 @@ install
163
165
# Setup libhugetlbfs mount point
164
166
libhugetlbfs_setup
165
167
166
- PRE_BUILD_PATH=" $( find /usr/lib* /libhugetlbfs -type f -name run_tests.py) "
168
+ if [ -n " ${LIBHUGETLBFS_PATH} " ] && [ -d " ${LIBHUGETLBFS_PATH} " ]
169
+ then
170
+ overlay=yes
171
+ else
172
+ LIBHUGETLBFS_PATH=" $( find /usr/lib* /libhugetlbfs -type f -name run_tests.py) "
173
+ fi
167
174
168
- if [ -n " ${PRE_BUILD_PATH} " ]
175
+
176
+ if [ -n " ${overlay} " ]
177
+ then
178
+ echo " pre built libhugtlbfs found in overlays"
179
+ cd " ${LIBHUGETLBFS_PATH} " || exit
180
+ elif [ -n " ${LIBHUGETLBFS_PATH} " ]
169
181
then
170
182
echo " pre built libhugetlbfs found on rootfs"
171
183
# shellcheck disable=SC2164
Original file line number Diff line number Diff line change @@ -32,8 +32,11 @@ params:
32
32
SKIP_INSTALL : " False"
33
33
VERSION : " 02df38e93e25e07f4d54edae94fb4ec90b7a2824"
34
34
35
+ # Pre-installed tests
36
+ LIBHUGETLBFS_PATH : " "
37
+
35
38
run :
36
39
steps :
37
40
- cd ./automated/linux/libhugetlbfs/
38
- - ./libhugetlbfs.sh -b "${WORD_SIZE}" -s "${SKIP_INSTALL}" -v "${VERSION}"
41
+ - ./libhugetlbfs.sh -b "${WORD_SIZE}" -p "${LIBHUGETLBFS_PATH}" - s "${SKIP_INSTALL}" -v "${VERSION}"
39
42
- ../../utils/send-to-lava.sh ./output/result.txt
You can’t perform that action at this time.
0 commit comments