From 0175141fbe00798ce38d9c315327ce4bb92b85ae Mon Sep 17 00:00:00 2001 From: ami-GS <1991.daiki@gmail.com> Date: Wed, 6 Nov 2024 17:33:51 -0800 Subject: [PATCH] show dotne and lttng versions --- scripts/prepare-machine.ps1 | 7 ++++++- scripts/test.ps1 | 4 +--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/scripts/prepare-machine.ps1 b/scripts/prepare-machine.ps1 index 0267a61424..20b109b12f 100644 --- a/scripts/prepare-machine.ps1 +++ b/scripts/prepare-machine.ps1 @@ -486,12 +486,14 @@ function Install-Dotnet { } function Install-Clog2Text { - Install-Dotnet + # Install-Dotnet Write-Host "Initializing clog submodule" git submodule init $RootDir/submodules/clog git submodule update + dotnet --version + dotnet build (Join-Path $RootDir submodules clog) $NuGetPath = Join-Path $RootDir "submodules" "clog" "src" "nupkg" Install-DotnetTool -ToolName "Microsoft.Logging.CLOG2Text.Lttng" -Version "0.0.1" -NuGetPath $NuGetPath @@ -584,6 +586,9 @@ if ($IsLinux) { sudo apt-get install -y lttng-tools sudo apt-get install -y liblttng-ust-dev sudo apt-get install -y gdb + + lttng --version + lttng-sessiond --version if ($UseXdp) { if (!$IsUbuntu2404) { sudo apt-add-repository "deb http://mirrors.kernel.org/ubuntu noble main" -y diff --git a/scripts/test.ps1 b/scripts/test.ps1 index 92e6d67ee1..efcd1f5899 100644 --- a/scripts/test.ps1 +++ b/scripts/test.ps1 @@ -369,9 +369,7 @@ for ($iteration = 1; $iteration -le $NumIterations; $iteration++) { $NOFILE = Invoke-Expression "bash -c 'ulimit -n'" Invoke-Expression ('/usr/bin/sudo bash -c "ulimit -n $NOFILE && pwsh $RunTest -Path $TestPath $TestArguments"') } else { - $NOFILE = Invoke-Expression "bash -c 'ulimit -n'" - Invoke-Expression ('/usr/bin/sudo bash -c "ulimit -n $NOFILE && pwsh $RunTest -Path $TestPath $TestArguments"') - # Invoke-Expression ($RunTest + " -Path $TestPath " + $TestArguments) + Invoke-Expression ($RunTest + " -Path $TestPath " + $TestArguments) } } }