From 61e521bc63b2ebfc4ad24bcf328e1cbf223d21bc Mon Sep 17 00:00:00 2001 From: Howard Stearns Date: Mon, 8 Feb 2016 09:33:32 -0800 Subject: [PATCH] Fix build (and remove unneeded test file). --- examples/tests/testBaton.js | 35 ----------------------------------- tests/CMakeLists.txt | 2 +- 2 files changed, 1 insertion(+), 36 deletions(-) delete mode 100644 examples/tests/testBaton.js diff --git a/examples/tests/testBaton.js b/examples/tests/testBaton.js deleted file mode 100644 index 74fa0d39e4..0000000000 --- a/examples/tests/testBaton.js +++ /dev/null @@ -1,35 +0,0 @@ -"use strict"; -/*jslint nomen: true, plusplus: true, vars: true*/ -var Vec3, Quat, MyAvatar, Entities, Camera, Script, print; -// -// Created by Howard Stearns -// Copyright 2016 High Fidelity, Inc. -// -// Distributed under the Apache License, Version 2.0. -// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html -// -// test libraries/virtualBaton.js -// All participants should run the test script. - - -Script.include("../libraries/virtualBaton.31.js"); -var TICKER_INTERVAL = 1000; // ms -var baton = virtualBaton({key: 'io.highfidelity.testBaton', debugSend: true, debugFlow: true, debugReceive: true}); -var ticker, countDown; - -// Tick every TICKER_INTERVAL. -function gotBaton(key) { - print("gotBaton", key); - countDown = 20; - ticker = Script.setInterval(function () { - print("tick"); - }, 1000); -} -// If we've lost the baton (e.g., to network problems), stop ticking -// but ask for the baton back (waiting indefinitely to get it). -function lostBaton(key) { - print("lostBaton", key); - Script.clearInterval(ticker); - baton.claim(gotBaton, lostBaton); -} -baton.claim(gotBaton, lostBaton); diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index ffdf4b7602..a8b0727e3d 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -4,7 +4,7 @@ enable_testing() # add the test directories file(GLOB TEST_SUBDIRS RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}/*") -list(REMOVE_ITEM TEST_SUBDIRS "CMakeFiles") +list(REMOVE_ITEM TEST_SUBDIRS "CMakeFiles" "mocha") foreach(DIR ${TEST_SUBDIRS}) if(IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/${DIR}") set(TEST_PROJ_NAME ${DIR})