diff --git a/.gitignore b/.gitignore index 47aa3446731..45427efab5d 100644 --- a/.gitignore +++ b/.gitignore @@ -72,3 +72,4 @@ xb/write xb/write_file next_gen +cache_tgz diff --git a/build.sh b/build.sh index fe33dfed46c..b01527e42b4 100755 --- a/build.sh +++ b/build.sh @@ -1,5 +1,6 @@ # scons --jobs 1 install PREFIX=/opt/daos TARGET_TYPE=debug # rm -rf /root/project/stor/daos/main/daos/build/external/debug/argobots +# 删除缓存: rm -rf build .sconf_temp .sconsign.dblite scons --jobs 32 install PREFIX=/opt/daos BUILD_TYPE=debug TARGET_TYPE=debug --build-deps=yes # for qemu: scons-3 --jobs 1 install PREFIX=/opt/daos BUILD_TYPE=debug TARGET_TYPE=debug --build-deps=yes # scons --jobs 1 install PREFIX=/opt/daos BUILD_TYPE=debug TARGET_TYPE=debug --build-deps=yes --implicit-deps-changed --config=force # scons --jobs 1 install PREFIX=/opt/daos BUILD_TYPE=debug TARGET_TYPE=debug --build-deps=no --implicit-deps-changed --config=force \ No newline at end of file diff --git a/install_rocky8_log b/install_rocky8_log new file mode 100644 index 00000000000..31aea8a6f42 --- /dev/null +++ b/install_rocky8_log @@ -0,0 +1,4 @@ +./utils/scripts/helpers/repo-helper-el8.sh +./utils/scripts/install-el8.sh + + diff --git a/src/vos/tests/SConscript b/src/vos/tests/SConscript index fb2d7855341..0556eff9e8a 100644 --- a/src/vos/tests/SConscript +++ b/src/vos/tests/SConscript @@ -18,18 +18,18 @@ def scons(): tenv.AppendUnique(RPATH_FULL=['$PREFIX/lib64/daos_srv']) tenv.Append(OBJPREFIX="b_") - vos_test_src = ['vos_tests.c', 'vos_tests_xb.c', 'vts_io.c', 'vts_pool.c', 'vts_container.c', + vos_test_src = ['vos_tests.c', 'vts_io.c', 'vts_pool.c', 'vts_container.c', tenv.Object("vts_common.c"), 'vts_aggregate.c', 'vts_dtx.c', 'vts_gc.c', 'vts_checksum.c', 'vts_ilog.c', 'vts_array.c', 'vts_pm.c', 'vts_ts.c', 'vts_mvcc.c', 'vos_cmd.c', 'vts_wal.c', '../../object/srv_csum.c', '../../object/srv_io_map.c'] vos_tests = tenv.d_program('vos_tests', vos_test_src, LIBS=libraries) - vos_tests_xb = tenv.d_program('vos_tests_xb', vos_test_src, LIBS=libraries) + # vos_tests_xb = tenv.d_program('vos_tests_xb', vos_test_src, LIBS=libraries) tenv.AppendUnique(CPPPATH=[Dir('../../common/tests').srcnode()]) evt_ctl = tenv.d_program('evt_ctl', ['evt_ctl.c', utest_utils, cmd_parser], LIBS=libraries) tenv.Install('$PREFIX/bin/', [vos_tests, evt_ctl]) - tenv.Install('$PREFIX/bin/', [vos_tests_xb, evt_ctl]) + # tenv.Install('$PREFIX/bin/', [vos_tests_xb, evt_ctl]) tenv.Install(conf_dir, ['vos_size_input.yaml']) unit_env = tenv.Clone() diff --git a/src/vos/tests/vos_tests_xb.c b/src/vos/tests/vos_tests_xb.c_ignore similarity index 100% rename from src/vos/tests/vos_tests_xb.c rename to src/vos/tests/vos_tests_xb.c_ignore