Re-enable some tests

Author: edolstra

src/libexpr-tests/nix_api_expr.cc

@@ -73,7 +73,6 @@ TEST_F(nix_api_expr_test, nix_expr_eval_add_numbers)
 
 TEST_F(nix_api_expr_test, nix_expr_eval_drv)
 {
-#if 0
     auto expr = R"(derivation { name = "myname"; builder = "mybuilder"; system = "mysystem"; })";
     nix_expr_eval_from_string(nullptr, state, expr, ".", value);
     ASSERT_EQ(NIX_TYPE_ATTRS, nix_get_type(nullptr, value));
@@ -99,7 +98,6 @@ TEST_F(nix_api_expr_test, nix_expr_eval_drv)
 
     nix_gc_decref(nullptr, valueResult);
     nix_state_free(stateResult);
-#endif
 }
 
 TEST_F(nix_api_expr_test, nix_build_drv)
@@ -137,11 +135,9 @@ TEST_F(nix_api_expr_test, nix_build_drv)
     StorePath * outStorePath = nix_store_parse_path(ctx, store, outPath.c_str());
     ASSERT_EQ(false, nix_store_is_valid_path(ctx, store, outStorePath));
 
-#if 0
     nix_store_realise(ctx, store, drvStorePath, nullptr, nullptr);
     auto is_valid_path = nix_store_is_valid_path(ctx, store, outStorePath);
     ASSERT_EQ(true, is_valid_path);
-#endif
 
     // Clean up
     nix_store_path_free(drvStorePath);
@@ -170,17 +166,14 @@ TEST_F(nix_api_expr_test, nix_expr_realise_context_bad_build)
         )";
     nix_expr_eval_from_string(ctx, state, expr, ".", value);
     assert_ctx_ok();
-#if 0
     auto r = nix_string_realise(ctx, state, value, false);
     ASSERT_EQ(nullptr, r);
     ASSERT_EQ(ctx->last_err_code, NIX_ERR_NIX_ERROR);
     ASSERT_THAT(ctx->last_err, testing::Optional(testing::HasSubstr("failed with exit code 1")));
-#endif
 }
 
 TEST_F(nix_api_expr_test, nix_expr_realise_context)
 {
-#if 0
     // TODO (ca-derivations): add a content-addressing derivation output, which produces a placeholder
     auto expr = R"(
         ''
@@ -235,7 +228,6 @@ TEST_F(nix_api_expr_test, nix_expr_realise_context)
     EXPECT_THAT(names[2], testing::StrEq("not-actually-built-yet.drv"));
 
     nix_realised_string_free(r);
-#endif
 }
 
 const char * SAMPLE_USER_DATA = "whatever";

src/libexpr-tests/value/value.cc

@@ -11,7 +11,7 @@ TEST_F(ValueTest, unsetValue)
 {
     Value unsetValue;
     ASSERT_EQ(false, unsetValue.isValid());
-    // ASSERT_DEATH(unsetValue.type(), "");
+    ASSERT_DEATH(unsetValue.type(), "");
 }
 
 TEST_F(ValueTest, vInt)