Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/windirstat/llfio.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNiall Douglas (s [underscore] sourceforge {at} nedprod [dot] com) <spamtrap@nedprod.com>2020-07-03 20:56:55 +0300
committerNiall Douglas (s [underscore] sourceforge {at} nedprod [dot] com) <spamtrap@nedprod.com>2020-07-03 20:56:55 +0300
commitcfe08ab0630f277b0c7d8f749c1cbca3172bb808 (patch)
tree8e61ca30e2dc6c154506329a4bbe0b309030f001
parent89f9dddd3e44a53317edb9a54883c85d47488b5b (diff)
More travis bashing, more appveyor debug printing
-rw-r--r--.travis.yml36
-rw-r--r--include/llfio/v2.0/detail/impl/windows/process_handle.ipp7
-rw-r--r--test/tests/process_handle.cpp4
3 files changed, 22 insertions, 25 deletions
diff --git a/.travis.yml b/.travis.yml
index 1ec16e0e..3f8ca011 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -13,9 +13,10 @@ notifications:
addons:
apt:
- sources:
- - sourceline: "ppa:ubuntu-toolchain-r/test"
+# sources:
+# - sourceline: "ppa:ubuntu-toolchain-r/test"
packages:
+ - g++-8
- clang
- g++-arm-linux-gnueabihf
- python3
@@ -34,8 +35,8 @@ env:
matrix:
include:
- - name: "g++ 9.3 x64 cmake tests (error_code)"
- compiler: g++-9
+ - name: "g++ 8.4 x64 cmake tests (error_code)"
+ compiler: g++-8
os: linux
env: NAME=x64_EC_tests
- name: "clang++ 7.0 x64 cmake tests (error_code)"
@@ -53,8 +54,8 @@ matrix:
os: osx
osx_image: xcode11.6
env: NAME=x64_EC_tests
- - name: "g++ 9.3 x64 cmake tests (status_code)"
- compiler: g++-9
+ - name: "g++ 8.4 x64 cmake tests (status_code)"
+ compiler: g++-8
os: linux
env:
- NAME=x64_SC_tests
@@ -79,11 +80,11 @@ matrix:
# - NAME=x64_SC_tests
# - CMAKE_CONFIGURE_OPTIONS=-DLLFIO_USE_EXPERIMENTAL_SG14_STATUS_CODE=ON
- name: "g++ ARM32 cmake build (error_code)"
- compiler: g++-9
+ compiler: g++
os: linux
env: NAME=ARM32_EC_build
- name: "g++ ARM32 cmake build (status_code)"
- compiler: g++-9
+ compiler: g++
os: linux
env:
- NAME=ARM32_SC_build
@@ -92,8 +93,8 @@ matrix:
compiler: clang++
os: linux
env: NAME=Documentation
- - name: "g++ 9.3 x64 Programs (error_code)"
- compiler: g++-9
+ - name: "g++ 8.4 x64 Programs (error_code)"
+ compiler: g++-8
os: linux
env: NAME=x64_EC_programs
- name: "clang++ 7.0 x64 Programs (error_code)"
@@ -119,8 +120,8 @@ matrix:
# env:
# - NAME=x64_SC_programs
# - CMAKE_CONFIGURE_OPTIONS=-DLLFIO_USE_EXPERIMENTAL_SG14_STATUS_CODE=ON
- - name: "g++ 9.3 Installability (error_code)"
- compiler: g++-9
+ - name: "g++ 8.4 Installability (error_code)"
+ compiler: g++-8
os: linux
env: NAME=x64_EC_install
- name: "clang++ 7.0 Installability (error_code)"
@@ -138,8 +139,8 @@ matrix:
os: osx
osx_image: xcode11.6
env: NAME=x64_EC_install
- - name: "g++ 9.3 Installability (status_code)"
- compiler: g++-9
+ - name: "g++ 8.4 Installability (status_code)"
+ compiler: g++-8
os: linux
env:
- NAME=x64_SC_install
@@ -165,9 +166,8 @@ matrix:
# - CMAKE_CONFIGURE_OPTIONS=-DLLFIO_USE_EXPERIMENTAL_SG14_STATUS_CODE=ON
before_install:
- - if [ "$TRAVIS_COMPILER" = "g++-9" ]; then
- sudo apt update;
- sudo apt install g++-9;
+ - if [ "$TRAVIS_COMPILER" = "g++-8" ]; then
+ export CXX=g++-8;
fi
- if [ "$TRAVIS_COMPILER" = "clang++-10" ]; then
wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key|sudo apt-key add -;
@@ -236,7 +236,7 @@ script:
after_success:
# - bash -x ./update_coveralls.sh `pwd`
# - NEWNAME=llfio-v2.0-binaries-linux64-$(date +%Y%m%d%H%M%S).tgz
- - if [ "$NAME" = "linux_g++-9_x64_EC_tests" ]; then
+ - if [ "$NAME" = "linux_g++-8_x64_EC_tests" ]; then
NEWNAME=llfio-v2.0-binaries-linux64-$TRAVIS_COMMIT.tgz;
mv llfio-v2.0-binaries-linux-x64.tgz $NEWNAME;
curl -T $NEWNAME -u jenkins-nedprod:$JENKINS_NEDPROD_PASSWORD https://dedi5.nedprod.com/static/files/upload/;
diff --git a/include/llfio/v2.0/detail/impl/windows/process_handle.ipp b/include/llfio/v2.0/detail/impl/windows/process_handle.ipp
index 90308b75..ef104231 100644
--- a/include/llfio/v2.0/detail/impl/windows/process_handle.ipp
+++ b/include/llfio/v2.0/detail/impl/windows/process_handle.ipp
@@ -87,10 +87,7 @@ LLFIO_HEADERS_ONLY_MEMFUNC_SPEC std::unique_ptr<span<path_view_component>, proce
// Laziness ...
return {};
}
- fprintf(stderr, "appveyor debug environment(): just before GetEnvironmentStringsW\n");
wchar_t *strings = GetEnvironmentStringsW();
- fprintf(stderr, "appveyor debug environment(): just after GetEnvironmentStringsW which returned %p\n", strings);
- fwprintf(stderr, L"appveyor debug environment(): GetEnvironmentStringsW %s\n", strings);
if(strings == nullptr)
{
return {};
@@ -103,11 +100,9 @@ LLFIO_HEADERS_ONLY_MEMFUNC_SPEC std::unique_ptr<span<path_view_component>, proce
for(; *e; e++)
{
}
- fwprintf(stderr, L"appveyor debug environment(): parsed %s\n", s);
if(*s != '=')
++count;
}
- fprintf(stderr, "appveyor debug environment(): there are %u strings\n", (unsigned) count);
const size_t bytesneeded = sizeof(span<path_view_component>) + sizeof(path_view_component) * count + (e - strings + 1) * sizeof(wchar_t);
auto ret = std::make_unique<byte[]>(bytesneeded);
auto &out = *(span<path_view_component> *) ret.get();
@@ -123,12 +118,10 @@ LLFIO_HEADERS_ONLY_MEMFUNC_SPEC std::unique_ptr<span<path_view_component>, proce
}
if(*s != '=')
{
- fwprintf(stderr, L"appveyor debug environment(): Adding %s\n", s);
*arraye++ = path_view_component(s, e, true);
out = {array, arraye};
}
}
- fprintf(stderr, "appveyor debug environment(): just before returning unique_ptr\n");
return std::unique_ptr<span<path_view_component>, process_handle::_byte_array_deleter>((span<path_view_component> *) ret.release());
}
diff --git a/test/tests/process_handle.cpp b/test/tests/process_handle.cpp
index 238eda5f..204d5822 100644
--- a/test/tests/process_handle.cpp
+++ b/test/tests/process_handle.cpp
@@ -41,10 +41,13 @@ static inline void TestProcessHandle(bool with_redirection) {
{
for(auto &i : *myenv)
{
+ visit(i, [](auto sv) { fwprintf(stderr, L"appveyor debug environment(): about to cout '%s'\n", (wchar_t *) sv.data()); });
std::cout << "\n " << i;
}
}
+ fprintf(stderr, "appveyor debug environment(): just after iteration\n");
std::cout << "\n" << std::endl;
+ fprintf(stderr, "appveyor debug environment(): just before launch process setup\n");
llfio::process_handle::flag flags = llfio::process_handle::flag::wait_on_close;
if(!with_redirection)
{
@@ -55,6 +58,7 @@ static inline void TestProcessHandle(bool with_redirection) {
char buffer[64];
sprintf(buffer, "--testchild,%u", (unsigned) n);
llfio::path_view_component arg(buffer);
+ fprintf(stderr, "appveyor debug environment(): just before launch process %u\n", (unsigned) n);
children.push_back(llfio::process_handle::launch_process(myexepath, {&arg, 1}, flags).value());
}
if(with_redirection)