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.

Sign up for GitHub

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

Jump to bottom

Feature/fix freebsd build #332

Closed
wants to merge 8 commits into from
Closed

Feature/fix freebsd build #332

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
d9977e8
deps: fix v8 build on FreeBSD
indutny Jan 13, 2015
9645fc2
cares: 0-ify AI_V4MAPPED on FreeBSD
indutny Jan 13, 2015
c731055
test: loosen timeout in spawnsync-test for FreeBSD
indutny Jan 13, 2015
36c79c7
test: fix setproctitle on FreeBSD
indutny Jan 13, 2015
4e458d7
test: disable fs-readfile-error on FreeBSD
indutny Jan 13, 2015
60a62a8
v4mapped
indutny Jan 13, 2015
22dd5a9
test-readfile
indutny Jan 13, 2015
0ac4ee3
dns: proper comment
indutny Jan 13, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion deps/v8/src/base/platform/platform-freebsd.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ std::vector<OS::SharedLibraryAddress> OS::GetSharedLibraryAddresses() {
if (bytes_read < 8) break;
unsigned end = StringToLong(addr_buffer);
char buffer[MAP_LENGTH];
int bytes_read = -1;
bytes_read = -1;
do {
bytes_read++;
if (bytes_read >= MAP_LENGTH - 1)
Expand Down
2 changes: 1 addition & 1 deletion deps/v8/src/base/platform/platform-posix.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -261,7 +261,7 @@ int OS::GetCurrentThreadId() {
#elif V8_OS_ANDROID
return static_cast<int>(gettid());
#else
return static_cast<int>(pthread_self());
return static_cast<int>(reinterpret_cast<intptr_t>(pthread_self()));
#endif
}

Expand Down
2 changes: 1 addition & 1 deletion deps/v8/src/debug.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -573,7 +573,7 @@ void Debug::ThreadInit() {
thread_local_.step_out_fp_ = 0;
// TODO(isolates): frames_are_dropped_?
base::NoBarrier_Store(&thread_local_.current_debug_scope_,
static_cast<base::AtomicWord>(NULL));
static_cast<base::AtomicWord>(0));
thread_local_.restarter_frame_function_pointer_ = NULL;
}

Expand Down
2 changes: 1 addition & 1 deletion deps/v8/src/preparser.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -467,7 +467,7 @@ class ParserBase : public Traits {
void ReportMessageAt(Scanner::Location location, const char* message,
bool is_reference_error = false) {
Traits::ReportMessageAt(location, message,
reinterpret_cast<const char*>(NULL),
reinterpret_cast<const char*>(0),
is_reference_error);
}

Expand Down
2 changes: 1 addition & 1 deletion deps/v8/src/unique.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ class Unique {

// TODO(titzer): this is a hack to migrate to Unique<T> incrementally.
static Unique<T> CreateUninitialized(Handle<T> handle) {
return Unique<T>(reinterpret_cast<Address>(NULL), handle);
return Unique<T>(NULL, handle);
}

static Unique<T> CreateImmovable(Handle<T> handle) {
Expand Down
3 changes: 3 additions & 0 deletions lib/dns.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,9 @@ exports.lookup = function lookup(hostname, options, callback) {
hints !== (exports.ADDRCONFIG | exports.V4MAPPED)) {
throw new TypeError('invalid argument: hints must use valid flags');
}

if (process.platform === 'freebsd' || family !== 6)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please add a FIXME comment explaining why this hack is currently needed.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh, and I might have pasted the wrong code on IRC; I think that should be &&, not ||. Mea culpa!

hints &= ~exports.V4MAPPED;
} else {
family = options >>> 0;
}
Expand Down
2 changes: 1 addition & 1 deletion test/parallel/test-child-process-spawnsync-timeout.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ var assert = require('assert');
var spawnSync = require('child_process').spawnSync;

var TIMER = 200;
var SLEEP = 1000;
var SLEEP = 5000;

switch (process.argv[2]) {
case 'child':
Expand Down
6 changes: 6 additions & 0 deletions test/parallel/test-fs-readfile-error.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,12 @@ var assert = require('assert');
var exec = require('child_process').exec;
var path = require('path');

// `fs.readFile('/')` does not fail on FreeBSD
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Because...? :-)

if (process.platform === 'freebsd') {
console.error('Skipping test, platform not supported.');
process.exit();
}

var callbacks = 0;

function test(env, cb) {
Expand Down
2 changes: 1 addition & 1 deletion test/sequential/test-setproctitle.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ exec('ps -p ' + process.pid + ' -o args=', function(error, stdout, stderr) {
assert.equal(stderr, '');

// freebsd always add ' (procname)' to the process title
if (process.platform === 'freebsd') title += ' (node)';
if (process.platform === 'freebsd') title += ' (iojs)';

// omitting trailing whitespace and \n
assert.equal(stdout.replace(/\s+$/, ''), title);
Expand Down