Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix building with relative paths #2979

Merged
merged 2 commits into from
Aug 10, 2017
Merged

fix building with relative paths #2979

merged 2 commits into from
Aug 10, 2017

Conversation

ObiWahn
Copy link
Contributor

@ObiWahn ObiWahn commented Aug 8, 2017

The pull request was recated because tests fail to find the arangobench executable.

it: feature/js_to_cpp_transaction_handler $=
»  bash -x ./scripts/unittest all
+ export PID=17621
+ PID=17621
+ export GLIBCXX_FORCE_NEW=1
+ GLIBCXX_FORCE_NEW=1
+ test -n ''
+ export EXT=
+ EXT=
+ PS=/
++ expr 1024 + 15271
+ export PORT=16295
+ PORT=16295
+ NUMA=
++ which numactl
+ NUMA='numactl --interleave=all'
+ '[' -z '' ']'
+ '[' -x build/bin/arangosh ']'
+ ARANGOSH=build/bin/arangosh
+ declare -a EXTRA_ARGS
++ uname -s
+ '[' Linux == Darwin ']'
++++ readlink -m ./scripts/unittest
+++ dirname /mnt/c9/jan/arangodb2/scripts/unittest
++ dirname /mnt/c9/jan/arangodb2/scripts
+ EXEC_PATH=/mnt/c9/jan/arangodb2
+ '[' -x build/bin/arangosh ']'
++ readlink -m build/bin/arangosh
+ ARANGOSH=/mnt/c9/jan/arangodb2-build/Release-asan/bin/arangosh
+ [[  all  =~ --build ]]
+++ dirname /mnt/c9/jan/arangodb2-build/Release-asan/bin/arangosh
++ dirname /mnt/c9/jan/arangodb2-build/Release-asan/bin
+ BUILD_PATH=/mnt/c9/jan/arangodb2-build/Release-asan
+ BUILD_PATH=/mnt/c9/jan/arangodb2-build/Release-asan
+ EXTRA_ARGS=("--build" "${BUILD_PATH}")
+ cd /mnt/c9/jan/arangodb2
+ exec numactl --interleave=all /mnt/c9/jan/arangodb2-build/Release-asan/bin/arangosh -c etc/relative/arangosh.conf --log.level warning --server.endpoint tcp://127.0.0.1:16295 --javascript.execute UnitTests/unittest.js -- all --build /mnt/c9/jan/arangodb2-build/Release-asan
2017-08-08T05:55:52Z [17635] WARNING arangosh.rc: ReferenceError: test_massif is not defined
caught exception during test execution!
unable to locate /mnt/c9/jan/arangodb2/mnt/c9/jan/arangodb2-build/Release-asan/bin/arangobench
Error: unable to locate /mnt/c9/jan/arangodb2/mnt/c9/jan/arangodb2-build/Release-asan/bin/arangobench
    at Object.setupBinaries (/mnt/c9/jan/arangodb2/js/client/modules/@arangodb/process-utils.js:149:13)
    at Object.unitTest (/mnt/c9/jan/arangodb2/js/client/modules/@arangodb/testing.js:447:6)
    at main (UnitTests/unittest.js:205:18)
    at UnitTests/unittest.js:260:14
{}
================================================================================

TEST RESULTS

================================================================================
* Overall state: Fail BUT! - We had at least one unclean shutdown or crash during the testrun.
   Suites failed: 0 Tests Failed: 0

As you can see the full qualified path is passed in with the --build option. In the function that is modified in the pull request the build path was unconditionally prefixed with TOPDIR what lead to the creation of a faulty path. I assume that something in the calling script changed in a way that now full paths are passed in under some conditions.

The patch checks if the builddir is already a valid directory and if so forgoes further modification.

@mvollmary
Copy link
Contributor

lgtm

@fceller fceller merged commit ab5f5f4 into devel Aug 10, 2017
ObiWahn added a commit that referenced this pull request Aug 15, 2017
…-different-error-codes-for-version-check

* origin/devel: (107 commits)
  Bug fix/use count for checksum (#3033)
  Added proper reference back for endpoint handler. (#3028)
  fix path detection for windows - arangosh doesn't understand cygwin paths - need to translate it to dos paths in advance.
  fix documentation - add missing files.
  added result code in error message
  fix fulltext index removal performance, simplified code (#3015)
  Feature/js to cpp transaction handler (#2985)
  ui: fixed a bug when success event triggers twice in a modal (#2983)
  fixed the appearance of the documents filter (#2984)
  graph vertex collections not restricted to 10 anymore (#2987)
  UI detection of JWT token in case of server restart or upgrade (#3001)
  Properly set PORTABLE flag (#3019)
  Feature/jemalloc 5.0.1 (#2991)
  fix building with relative paths (#2979)
  cleanup QueryResultV8 a bit (#2990)
  Bug fix/pre release woes (#2988)
  fix failing recovery test (called undefined function) (#2994)
  Bug fix/fix issue 3011 (#3012)
  Fixed invalid optimisation for variables/references used in traversal
  Bug fix/3.2.1 issues (#3009)
  ...
@fceller fceller deleted the bug-fix/build-paths branch August 18, 2017 08:05
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants