Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 454c92e0 authored by Kalle Raita's avatar Kalle Raita
Browse files

Switch from deprecated tempnam to TemporaryFile 

Bug: 32969944
Test: Compile for Marlin, execute 32bit/64bit EGLTest.
Change-Id: I3d995dc7467deb1d348b94dbbc98aafc211c80cf
parent 0ad5eb4a

opengl/tests/EGLTest/Android.mk

+1 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ LOCAL_SHARED_LIBRARIES := \ 
	libbinder \

	libutils \

	libgui \

	libbase \



LOCAL_C_INCLUDES := \

    bionic/libc/private \

opengl/tests/EGLTest/egl_cache_test.cpp

+8 −7
Original line number Diff line number Diff line
@@ -21,9 +21,13 @@ 


#include <utils/Log.h>



#include <android-base/test_utils.h>



#include "egl_cache.h"

#include "egl_display.h"



#include <memory>



namespace android {



class EGLCacheTest : public ::testing::Test {
@@ -79,23 +83,20 @@ protected: 


    virtual void SetUp() {

        EGLCacheTest::SetUp();



        char* tn = tempnam("/sdcard", "EGL_test-cache-");

        mFilename = tn;

        free(tn);

        mTempFile.reset(new TemporaryFile());

    }



    virtual void TearDown() {

        unlink(mFilename.string());

        mTempFile.reset(nullptr);

        EGLCacheTest::TearDown();

    }



    String8 mFilename;

    std::unique_ptr<TemporaryFile> mTempFile;

};



TEST_F(EGLCacheSerializationTest, ReinitializedCacheContainsValues) {

    uint8_t buf[4] = { 0xee, 0xee, 0xee, 0xee };

    mCache->setCacheFilename(mFilename);

    mCache->setCacheFilename(&mTempFile->path[0]);

    mCache->initialize(egl_display_t::get(EGL_DEFAULT_DISPLAY));

    mCache->setBlob("abcd", 4, "efgh", 4);

    mCache->terminate();