Skip to content

Commit 7dfad3d

Browse files
committed
libexpr: Fix tests on 32 bit systems
This test is now pointless and the comment is outdated. Also the test fails on 32 bit systems with: ../nix_api_value_internal.cc:22: Failure Expected equality of these values: sizeof(nix::Value) Which is: 12 sizeof(nix_value) Which is: 8 It just happeneded to work because Value is 16 bytes and nix_value was also 16 bytes. Also get rid of a pointless inline in new_nix_value, since it's already static and inline there does nothing.
1 parent 11b0fcd commit 7dfad3d

File tree

2 files changed

+1
-9
lines changed

2 files changed

+1
-9
lines changed

src/libexpr-c/nix_api_value.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ static nix::Value & check_value_out(nix_value * value)
5858
return v;
5959
}
6060

61-
static inline nix_value * new_nix_value(nix::Value * v, nix::EvalMemory & mem)
61+
static nix_value * new_nix_value(nix::Value * v, nix::EvalMemory & mem)
6262
{
6363
nix_value * ret = new (mem.allocBytes(sizeof(nix_value))) nix_value{
6464
.value = v,

src/libexpr-tests/nix_api_value_internal.cc

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,4 @@
1414

1515
namespace nixC {
1616

17-
TEST_F(nix_api_expr_test, as_nix_value_ptr)
18-
{
19-
// nix_alloc_value casts nix::Value to nix_value
20-
// It should be obvious from the decl that that works, but if it doesn't,
21-
// the whole implementation would be utterly broken.
22-
ASSERT_EQ(sizeof(nix::Value), sizeof(nix_value));
23-
}
24-
2517
} // namespace nixC

0 commit comments

Comments
 (0)